1 files changed, 6 insertions, 3 deletions
diff --git a/tests/storage/test_profile.py b/tests/storage/test_profile.py
index 003076ec53..8d258f9eec 100644
--- a/tests/storage/test_profile.py
+++ b/tests/storage/test_profile.py
@@ -24,10 +24,9 @@ from tests.utils import setup_test_homeserver
 
 
 class ProfileStoreTestCase(unittest.TestCase):
-
     @defer.inlineCallbacks
     def setUp(self):
-        hs = yield setup_test_homeserver()
+        hs = yield setup_test_homeserver(self.addCleanup)
 
         self.store = ProfileStore(None, hs)
 
@@ -35,6 +34,8 @@ class ProfileStoreTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def test_displayname(self):
+        yield self.store.create_profile(self.u_frank.localpart)
+
         yield self.store.set_profile_displayname(
             self.u_frank.localpart, "Frank", 1,
         )
@@ -46,11 +47,13 @@ class ProfileStoreTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def test_avatar_url(self):
+        yield self.store.create_profile(self.u_frank.localpart)
+
         yield self.store.set_profile_avatar_url(
             self.u_frank.localpart, "http://my.site/here", 1,
         )
 
         self.assertEquals(
             "http://my.site/here",
-            (yield self.store.get_profile_avatar_url(self.u_frank.localpart))
+            (yield self.store.get_profile_avatar_url(self.u_frank.localpart)),
         )