diff --git a/tests/storage/test_profile.py b/tests/storage/test_profile.py
index bca056b29..45c69dafa 100644
--- a/tests/storage/test_profile.py
+++ b/tests/storage/test_profile.py
@@ -53,11 +53,14 @@ class SQLiteMemoryDbPool(ConnectionPool, object):
 
 
 class ProfileStoreTestCase(unittest.TestCase):
+
+    @defer.inlineCallbacks
     def setUp(self):
         hs = HomeServer("test",
             db_pool=SQLiteMemoryDbPool(),
         )
-        hs.get_db_pool().prepare()
+
+        yield hs.get_db_pool().prepare()
 
         self.store = ProfileStore(hs)