diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/Cluster.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/Cluster.java
index 9db4196417908..3185c7ddf0e9d 100644
--- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/Cluster.java
+++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/Cluster.java
@@ -98,9 +98,8 @@ public void start() throws InterruptedException, ExecutionException
         ExecutorService executor = Executors.newCachedThreadPool( new NamedThreadFactory( "cluster-starter" ) );
         try
         {
-            CompletionService<EdgeGraphDatabase> edgeGraphDatabaseCompletionService = startEdgeMembers( executor );
             startCoreMembers( executor );
-            waitForEdgeServers( edgeGraphDatabaseCompletionService );
+            startEdgeMembers( executor );
         }
         finally
         {
@@ -425,7 +424,7 @@ private void startCoreMembers( ExecutorService executor ) throws InterruptedExce
         }
     }
 
-    private CompletionService<EdgeGraphDatabase> startEdgeMembers( ExecutorService executor ) throws InterruptedException, ExecutionException
+    private void startEdgeMembers( ExecutorService executor ) throws InterruptedException, ExecutionException
     {
         CompletionService<EdgeGraphDatabase> ecs = new ExecutorCompletionService<>( executor );
 
@@ -437,7 +436,11 @@ private CompletionService<EdgeGraphDatabase> startEdgeMembers( ExecutorService e
                 return edgeClusterMember.database();
             } );
         }
-        return ecs;
+
+        for ( int i = 0; i < edgeMembers.size(); i++ )
+        {
+            ecs.take().get();
+        }
     }
 
     private void createEdgeMembers( int noOfEdgeMembers,