diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java
index 576807fd97c6..9d19752faea3 100644
--- a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java
+++ b/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java
@@ -99,6 +99,7 @@ public void setUp() throws Exception
                                 .compressionProvider(new PotentiallyGzippedCompressionProvider(false))
                                 .build();
     cf.start();
+    cf.blockUntilConnected();
     cf.create().creatingParentsIfNeeded().forPath(basePath);
     cf.create().creatingParentsIfNeeded().forPath(tasksPath);
 
diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordResourceTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordResourceTest.java
index f18f6ebe8283..5987e60f5bfa 100644
--- a/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordResourceTest.java
+++ b/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordResourceTest.java
@@ -146,6 +146,7 @@ public void setUp() throws Exception
     IndexerZkConfig indexerZkConfig = new IndexerZkConfig(new ZkPathsConfig(), null, null, null, null, null);
     setupServerAndCurator();
     curator.start();
+    curator.blockUntilConnected();
     curator.create().creatingParentsIfNeeded().forPath(indexerZkConfig.getLeaderLatchPath());
     druidNode = new DruidNode("hey", "what", 1234);
     ServiceEmitter serviceEmitter = new NoopServiceEmitter();
diff --git a/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java b/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java
index 1b1ccbbf71b7..5d70f7a88747 100644
--- a/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java
+++ b/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java
@@ -102,6 +102,7 @@ public void setUp() throws Exception
                                 .compressionProvider(new PotentiallyGzippedCompressionProvider(false))
                                 .build();
     cf.start();
+    cf.blockUntilConnected();
     cf.create().creatingParentsIfNeeded().forPath(basePath);
 
     worker = new Worker(
diff --git a/indexing-service/src/test/java/io/druid/indexing/worker/http/WorkerResourceTest.java b/indexing-service/src/test/java/io/druid/indexing/worker/http/WorkerResourceTest.java
index f5da72a96526..edfce8a296a4 100644
--- a/indexing-service/src/test/java/io/druid/indexing/worker/http/WorkerResourceTest.java
+++ b/indexing-service/src/test/java/io/druid/indexing/worker/http/WorkerResourceTest.java
@@ -66,6 +66,7 @@ public void setUp() throws Exception
                                 .compressionProvider(new PotentiallyGzippedCompressionProvider(false))
                                 .build();
     cf.start();
+    cf.blockUntilConnected();
     cf.create().creatingParentsIfNeeded().forPath(basePath);
 
     worker = new Worker(
diff --git a/server/src/test/java/io/druid/client/BrokerServerViewTest.java b/server/src/test/java/io/druid/client/BrokerServerViewTest.java
index 6298ecba363f..fd3fb91d75ff 100644
--- a/server/src/test/java/io/druid/client/BrokerServerViewTest.java
+++ b/server/src/test/java/io/druid/client/BrokerServerViewTest.java
@@ -81,6 +81,7 @@ public void setUp() throws Exception
   {
     setupServerAndCurator();
     curator.start();
+    curator.blockUntilConnected();
   }
 
   @Test
diff --git a/server/src/test/java/io/druid/client/CoordinatorServerViewTest.java b/server/src/test/java/io/druid/client/CoordinatorServerViewTest.java
index 3e01804df092..17636c031227 100644
--- a/server/src/test/java/io/druid/client/CoordinatorServerViewTest.java
+++ b/server/src/test/java/io/druid/client/CoordinatorServerViewTest.java
@@ -73,6 +73,7 @@ public void setUp() throws Exception
   {
     setupServerAndCurator();
     curator.start();
+    curator.blockUntilConnected();
   }
 
   @Test
diff --git a/server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java b/server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java
index d6f0d5bc0278..df30f9abeffe 100644
--- a/server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java
+++ b/server/src/test/java/io/druid/client/client/BatchServerInventoryViewTest.java
@@ -96,6 +96,7 @@ public void setUp() throws Exception
                                 .compressionProvider(new PotentiallyGzippedCompressionProvider(true))
                                 .build();
     cf.start();
+    cf.blockUntilConnected();
     cf.create().creatingParentsIfNeeded().forPath(testBasePath);
 
     jsonMapper = new DefaultObjectMapper();
diff --git a/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java b/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java
index 2c13f93861ea..babd89352707 100644
--- a/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java
+++ b/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java
@@ -184,6 +184,7 @@ public void eventReceived(CuratorFramework client, CuratorEvent event) throws Ex
   public void testCleansUpItsLittleTurdlings() throws Exception
   {
     curator.start();
+    curator.blockUntilConnected();
     Announcer announcer = new Announcer(curator, exec);
 
     final byte[] billy = "billy".getBytes();
@@ -209,6 +210,7 @@ public void testCleansUpItsLittleTurdlings() throws Exception
   public void testLeavesBehindTurdlingsThatAlreadyExisted() throws Exception
   {
     curator.start();
+    curator.blockUntilConnected();
     Announcer announcer = new Announcer(curator, exec);
 
     final byte[] billy = "billy".getBytes();
@@ -237,6 +239,7 @@ public void testLeavesBehindTurdlingsThatAlreadyExisted() throws Exception
   public void testLeavesBehindTurdlingsWhenToldTo() throws Exception
   {
     curator.start();
+    curator.blockUntilConnected();
     Announcer announcer = new Announcer(curator, exec);
 
     final byte[] billy = "billy".getBytes();
diff --git a/server/src/test/java/io/druid/curator/discovery/ServiceAnnouncerTest.java b/server/src/test/java/io/druid/curator/discovery/ServiceAnnouncerTest.java
index 087ce8251b10..0210a58a7907 100644
--- a/server/src/test/java/io/druid/curator/discovery/ServiceAnnouncerTest.java
+++ b/server/src/test/java/io/druid/curator/discovery/ServiceAnnouncerTest.java
@@ -46,6 +46,7 @@ public void setUp() throws Exception
   public void testServiceAnnouncement() throws Exception
   {
     curator.start();
+    curator.blockUntilConnected();
     List<String> serviceNames = ImmutableList.of(
         "druid/overlord",
         "druid/coordinator",
@@ -79,6 +80,7 @@ public boolean apply(String input)
   public void testServiceAnnouncementFail() throws Exception
   {
     curator.start();
+    curator.blockUntilConnected();
     createAndAnnounceServices(ImmutableList.of("placeholder/\u0001"));
   }
 
diff --git a/server/src/test/java/io/druid/curator/inventory/CuratorInventoryManagerTest.java b/server/src/test/java/io/druid/curator/inventory/CuratorInventoryManagerTest.java
index 2383fdacef49..d64910b22ccd 100644
--- a/server/src/test/java/io/druid/curator/inventory/CuratorInventoryManagerTest.java
+++ b/server/src/test/java/io/druid/curator/inventory/CuratorInventoryManagerTest.java
@@ -66,6 +66,8 @@ curator, new StringInventoryManagerConfig("/container", "/inventory"), exec, str
     );
 
     curator.start();
+    curator.blockUntilConnected();
+
     manager.start();
 
     Assert.assertTrue(Iterables.isEmpty(manager.getInventory()));
diff --git a/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java b/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java
index 0233a29c1a6c..8c0fae715af4 100644
--- a/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java
+++ b/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java
@@ -79,6 +79,7 @@ public void setUp() throws Exception
   {
     setupServerAndCurator();
     curator.start();
+    curator.blockUntilConnected();
     try {
       infoDir = new File(File.createTempFile("blah", "blah2").getParent(), "ZkCoordinatorTest");
       infoDir.mkdirs();
diff --git a/server/src/test/java/io/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java b/server/src/test/java/io/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
index feb3f43e17ca..26d13af6baf4 100644
--- a/server/src/test/java/io/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
+++ b/server/src/test/java/io/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
@@ -76,6 +76,7 @@ public void setUp() throws Exception
                                 .compressionProvider(new PotentiallyGzippedCompressionProvider(false))
                                 .build();
     cf.start();
+    cf.blockUntilConnected();
     cf.create().creatingParentsIfNeeded().forPath(testBasePath);
 
     jsonMapper = new DefaultObjectMapper();
diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java
index 7408afded841..a576c89be757 100644
--- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java
+++ b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java
@@ -112,6 +112,7 @@ public void setUp() throws Exception
     EasyMock.replay(configManager);
     setupServerAndCurator();
     curator.start();
+    curator.blockUntilConnected();
     curator.create().creatingParentsIfNeeded().forPath(LOADPATH);
     objectMapper = new DefaultObjectMapper();
     druidCoordinatorConfig = new TestDruidCoordinatorConfig(new Duration(COORDINATOR_START_DELAY), new Duration(COORDINATOR_PERIOD), null, null, null, false, false);
diff --git a/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTest.java b/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTest.java
index bf040dc10532..d8a6e85b01bc 100644
--- a/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTest.java
+++ b/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTest.java
@@ -64,6 +64,7 @@ public void setUp() throws Exception
   {
     setupServerAndCurator();
     curator.start();
+    curator.blockUntilConnected();
     curator.create().creatingParentsIfNeeded().forPath(LOAD_QUEUE_PATH);
 
     loadQueueCache = new PathChildrenCache(