diff --git a/test/test_buildman.py b/test/test_buildman.py
index 541c807af..b58eddb45 100644
--- a/test/test_buildman.py
+++ b/test/test_buildman.py
@@ -104,7 +104,7 @@ class TestEphemeral(unittest.TestCase):
   @coroutine
   def _setup_job_for_managers(self):
     # Test that we are watching the realm location before anything else happens
-    self.etcd_client_mock.watch.assert_any_call('realm/', recursive=True, timeout=0, index=None)
+    self.etcd_client_mock.watch.assert_any_call('realm/', recursive=True, timeout=30, index=None)
 
     self.etcd_client_mock.read = Mock(side_effect=KeyError)
     test_component = Mock(spec=BuildComponent)
@@ -182,7 +182,7 @@ class TestEphemeral(unittest.TestCase):
   @async_test
   def test_expiring_worker(self):
     # Test that we are watching before anything else happens
-    self.etcd_client_mock.watch.assert_any_call('building/', recursive=True, timeout=0, index=None)
+    self.etcd_client_mock.watch.assert_any_call('building/', recursive=True, timeout=30, index=None)
 
     # Send a signal to the callback that a worker has expired
     expired_result = Mock(spec=etcd.EtcdResult)
@@ -201,7 +201,7 @@ class TestEphemeral(unittest.TestCase):
     test_component = yield From(self._setup_job_for_managers())
 
     # Test that we are watching before anything else happens
-    self.etcd_client_mock.watch.assert_any_call('building/', recursive=True, timeout=0, index=None)
+    self.etcd_client_mock.watch.assert_any_call('building/', recursive=True, timeout=30, index=None)
 
     # Send a signal to the callback that a worker has expired
     expired_result = Mock(spec=etcd.EtcdResult)