diff --git a/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java b/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
index 1826aac0d3db..22e25a7f1c87 100644
--- a/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
+++ b/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
@@ -359,15 +359,14 @@ protected <K, V> List<Cache<K, V>> createClusteredCaches(int numMembersInCluster
          if (cacheNames.length == 0) {
             Cache<K, V> cache = cm.getCache();
             caches.add(cache);
-            waitForClusterToForm();
          } else {
             for (String cacheName : cacheNames) {
                cm.defineConfiguration(cacheName, defaultConfigBuilder.build());
                caches.add(cm.getCache(cacheName));
             }
-            waitForClusterToForm(cacheNames);
          }
       }
+      waitForClusterToForm(cacheNames);
       return caches;
    }