diff --git a/helios-services/src/main/java/com/spotify/helios/servicescommon/coordination/ZooKeeperHealthChecker.java b/helios-services/src/main/java/com/spotify/helios/servicescommon/coordination/ZooKeeperHealthChecker.java
index 0f6aa8bd7..853a23c87 100644
--- a/helios-services/src/main/java/com/spotify/helios/servicescommon/coordination/ZooKeeperHealthChecker.java
+++ b/helios-services/src/main/java/com/spotify/helios/servicescommon/coordination/ZooKeeperHealthChecker.java
@@ -51,7 +51,7 @@ public ZooKeeperHealthChecker(final ZooKeeperClient zooKeeperClient, final Strin
                                 final RiemannFacade facade, final TimeUnit timeUnit,
                                 final long interval) {
     super("zookeeper");
-    this.scheduler = Executors.newScheduledThreadPool(1);
+    this.scheduler = Executors.newScheduledThreadPool(2);
     this.cache = new PathChildrenCache(zooKeeperClient.getCuratorFramework(), path, true, false,
         scheduler);
     this.facade = facade.stack("zookeeper-connection");
diff --git a/helios-services/src/test/java/com/spotify/helios/servicescommon/SentryTest.java b/helios-services/src/test/java/com/spotify/helios/servicescommon/SentryTest.java
index 0ec522fa0..2c5e280a3 100644
--- a/helios-services/src/test/java/com/spotify/helios/servicescommon/SentryTest.java
+++ b/helios-services/src/test/java/com/spotify/helios/servicescommon/SentryTest.java
@@ -47,7 +47,7 @@ public class SentryTest {
 
   @Rule public TemporaryPorts temporaryPorts = TemporaryPorts.create();
 
-  private static final int UDP_SERVER_TIMEOUT = 5000;
+  private static final int UDP_SERVER_TIMEOUT = 60000;
 
   private int sentryPort;
   private String testDsn;