diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py
index a43fc7fc7e..c09816b372 100644
--- a/synapse/handlers/e2e_room_keys.py
+++ b/synapse/handlers/e2e_room_keys.py
@@ -18,7 +18,7 @@ import logging
 from twisted.internet import defer
 
 from synapse.api.errors import StoreError, SynapseError, RoomKeysVersionError
-from synapse.util.async import Linearizer
+from synapse.util.async_helpers import Linearizer
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/handlers/test_e2e_room_keys.py b/tests/handlers/test_e2e_room_keys.py
index 8bfffb5c0e..7fa4264441 100644
--- a/tests/handlers/test_e2e_room_keys.py
+++ b/tests/handlers/test_e2e_room_keys.py
@@ -52,6 +52,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
     @defer.inlineCallbacks
     def setUp(self):
         self.hs = yield utils.setup_test_homeserver(
+            self.addCleanup,
             handlers=None,
             replication_layer=mock.Mock(),
         )