diff --git a/orderer/common/cluster/comm_test.go b/orderer/common/cluster/comm_test.go
index acb6e40b571..40106c3a0ba 100644
--- a/orderer/common/cluster/comm_test.go
+++ b/orderer/common/cluster/comm_test.go
@@ -395,6 +395,12 @@ func TestInvalidChannel(t *testing.T) {
 		defer node1.stop()
 
 		node1.c.Configure(testChannel, []cluster.RemoteNode{node1.nodeInfo})
+		gt := gomega.NewGomegaWithT(t)
+		gt.Eventually(func() (bool, error) {
+			_, err := node1.c.Remote(testChannel, node1.nodeInfo.ID)
+			return true, err
+		}).Should(gomega.BeTrue())
+
 		stub, err := node1.c.Remote(testChannel, node1.nodeInfo.ID)
 		assert.NoError(t, err)
 		// An empty StepRequest has an empty channel which is invalid