diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py
index 58ecf561ffba14839c126387f44642ff21dd6f4c..f7eb7b4f0362738276828fe5963bff2da3a850cf 100644
--- a/tests/handlers/test_directory.py
+++ b/tests/handlers/test_directory.py
@@ -50,16 +50,17 @@ class DirectoryTestCase(unittest.TestCase):
             self.query_handlers[query_type] = handler
         self.mock_federation.register_query_handler = register_query_handler
 
+        db_pool = SQLiteMemoryDbPool()
+        yield db_pool.prepare()
+
         hs = HomeServer("test",
-            db_pool=SQLiteMemoryDbPool(),
+            db_pool=db_pool,
             http_client=None,
             resource_for_federation=Mock(),
             replication_layer=self.mock_federation,
         )
         hs.handlers = DirectoryHandlers(hs)
 
-        yield hs.get_db_pool().prepare()
-
         self.handler = hs.get_handlers().directory_handler
 
         self.store = hs.get_datastore()
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index c98f877e843a65f1fc23680d3b6545e925168131..61e9cc7042ef20be454e215092927cf38b8ddd9a 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -68,17 +68,18 @@ class PresenceStateTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def setUp(self):
+        db_pool = SQLiteMemoryDbPool()
+        yield db_pool.prepare()
+
         hs = HomeServer("test",
             clock=MockClock(),
-            db_pool=SQLiteMemoryDbPool(),
+            db_pool=db_pool,
             handlers=None,
             resource_for_federation=Mock(),
             http_client=None,
         )
         hs.handlers = JustPresenceHandlers(hs)
 
-        yield hs.get_db_pool().prepare()
-
         self.store = hs.get_datastore()
 
         # Mock the RoomMemberHandler
diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py
index 8b9685a527378f72890727eb1f45a69ea498b4df..63c92959443623664746fb87cce99e876e38d8bd 100644
--- a/tests/handlers/test_profile.py
+++ b/tests/handlers/test_profile.py
@@ -49,8 +49,11 @@ class ProfileTestCase(unittest.TestCase):
             self.query_handlers[query_type] = handler
         self.mock_federation.register_query_handler = register_query_handler
 
+        db_pool = SQLiteMemoryDbPool()
+        yield db_pool.prepare()
+
         hs = HomeServer("test",
-                db_pool=SQLiteMemoryDbPool(),
+                db_pool=db_pool,
                 http_client=None,
                 handlers=None,
                 resource_for_federation=Mock(),
@@ -58,8 +61,6 @@ class ProfileTestCase(unittest.TestCase):
             )
         hs.handlers = ProfileHandlers(hs)
 
-        yield hs.get_db_pool().prepare()
-
         self.store = hs.get_datastore()
 
         self.frank = hs.parse_userid("@1234ABCD:test")
diff --git a/tests/storage/test_directory.py b/tests/storage/test_directory.py
index 49c41700f6950019c0b49338c3bc361708a3f4d8..c4c321dda651930b657a9f16d7168871c9be781c 100644
--- a/tests/storage/test_directory.py
+++ b/tests/storage/test_directory.py
@@ -27,12 +27,13 @@ class DirectoryStoreTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def setUp(self):
+        db_pool = SQLiteMemoryDbPool()
+        yield db_pool.prepare()
+
         hs = HomeServer("test",
-            db_pool=SQLiteMemoryDbPool(),
+            db_pool=db_pool,
         )
 
-        yield hs.get_db_pool().prepare()
-
         self.store = DirectoryStore(hs)
 
         self.room = hs.parse_roomid("!abcde:test")
diff --git a/tests/storage/test_presence.py b/tests/storage/test_presence.py
index f0a04ae830035ffcd3344acf7ce3ba814f1b4e43..f3fab4fe794958824618a4d8fd95bcb1a1813388 100644
--- a/tests/storage/test_presence.py
+++ b/tests/storage/test_presence.py
@@ -27,13 +27,14 @@ class PresenceStoreTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def setUp(self):
+        db_pool = SQLiteMemoryDbPool()
+        yield db_pool.prepare()
+
         hs = HomeServer("test",
             clock=MockClock(),
-            db_pool=SQLiteMemoryDbPool(),
+            db_pool=db_pool,
         )
 
-        yield hs.get_db_pool().prepare()
-
         self.store = PresenceStore(hs)
 
         self.u_apple = hs.parse_userid("@apple:test")
diff --git a/tests/storage/test_profile.py b/tests/storage/test_profile.py
index fa96abf03b1109289bc6a6f5231f3fdd4fd42d61..1855278044c267fb17fa139bfa6760b87c8df1b8 100644
--- a/tests/storage/test_profile.py
+++ b/tests/storage/test_profile.py
@@ -27,12 +27,13 @@ class ProfileStoreTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def setUp(self):
+        db_pool = SQLiteMemoryDbPool()
+        yield db_pool.prepare()
+
         hs = HomeServer("test",
-            db_pool=SQLiteMemoryDbPool(),
+            db_pool=db_pool,
         )
 
-        yield hs.get_db_pool().prepare()
-
         self.store = ProfileStore(hs)
 
         self.u_frank = hs.parse_userid("@frank:test")