diff --git a/test/test_buildman.py b/test/test_buildman.py
index a34da811e..543c5fc5d 100644
--- a/test/test_buildman.py
+++ b/test/test_buildman.py
@@ -10,8 +10,7 @@ from threading import Event
 from urllib3.exceptions import ReadTimeoutError
 
 from buildman.manager.executor import BuilderExecutor
-from buildman.manager.ephemeral import (EphemeralBuilderManager, ETCD_BUILDER_PREFIX,
-                                        ETCD_REALM_PREFIX, EtcdAction)
+from buildman.manager.ephemeral import EphemeralBuilderManager, EtcdAction
 from buildman.server import BuildJobResult
 from buildman.component.buildcomponent import BuildComponent
 
@@ -92,7 +91,7 @@ class TestEphemeral(unittest.TestCase):
     self.manager.initialize({'EXECUTOR': 'test'})
 
     self.mock_job = self._create_build_job()
-    self.mock_job_key = os.path.join(ETCD_BUILDER_PREFIX, BUILD_UUID)
+    self.mock_job_key = os.path.join('building/', BUILD_UUID)
 
   def tearDown(self):
     self.etcd_wait_event.set()
@@ -105,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(ETCD_REALM_PREFIX, recursive=True, timeout=0)
+    self.etcd_client_mock.watch.assert_any_call('realm/', recursive=True, timeout=0)
 
     self.etcd_client_mock.read = Mock(side_effect=KeyError)
     test_component = Mock(spec=BuildComponent)
@@ -118,7 +117,7 @@ class TestEphemeral(unittest.TestCase):
 
     self.assertTrue(is_scheduled)
 
-    self.etcd_client_mock.read.assert_called_once_with(ETCD_BUILDER_PREFIX, recursive=True)
+    self.etcd_client_mock.read.assert_called_once_with('building/', recursive=True)
     self.assertEqual(self.test_executor.start_builder.call_count, 1)
     self.assertEqual(self.etcd_client_mock.write.call_args_list[0][0][0], self.mock_job_key)
     self.assertEqual(self.etcd_client_mock.write.call_args_list[1][0][0], self.mock_job_key)
@@ -128,7 +127,7 @@ class TestEphemeral(unittest.TestCase):
 
     realm_created = Mock(spec=etcd.EtcdResult)
     realm_created.action = EtcdAction.CREATE
-    realm_created.key = os.path.join(ETCD_REALM_PREFIX, REALM_ID)
+    realm_created.key = os.path.join('realm/', REALM_ID)
     realm_created.value = json.dumps({
         'realm': REALM_ID,
         'token': 'beef',
@@ -150,7 +149,7 @@ class TestEphemeral(unittest.TestCase):
     # Take the job ourselves
     yield From(self.manager.build_component_ready(test_component))
 
-    self.etcd_client_mock.delete.assert_called_once_with(os.path.join(ETCD_REALM_PREFIX, REALM_ID))
+    self.etcd_client_mock.delete.assert_called_once_with(os.path.join('realm/', REALM_ID))
     self.etcd_client_mock.delete.reset_mock()
 
     # Finish the job
@@ -166,7 +165,7 @@ class TestEphemeral(unittest.TestCase):
 
     realm_deleted = Mock(spec=etcd.EtcdResult)
     realm_deleted.action = EtcdAction.DELETE
-    realm_deleted.key = os.path.join(ETCD_REALM_PREFIX, REALM_ID)
+    realm_deleted.key = os.path.join('realm/', REALM_ID)
 
     realm_deleted._prev_node = Mock(spec=etcd.EtcdResult)
     realm_deleted._prev_node.value = json.dumps({
@@ -183,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(ETCD_BUILDER_PREFIX, recursive=True, timeout=0)
+    self.etcd_client_mock.watch.assert_any_call('building/', recursive=True, timeout=0)
 
     # Send a signal to the callback that a worker has expired
     expired_result = Mock(spec=etcd.EtcdResult)