diff --git a/tests/config/test_room_directory.py b/tests/config/test_room_directory.py
index 393736b2ca5..e25f7787f45 100644
--- a/tests/config/test_room_directory.py
+++ b/tests/config/test_room_directory.py
@@ -19,14 +19,14 @@
 #
 import yaml
 
-from twisted.internet.testing import MemoryReactor
+from twisted.test.proto_helpers import MemoryReactor
 
 import synapse.rest.admin
 import synapse.rest.client.login
 import synapse.rest.client.room
 from synapse.config.room_directory import RoomDirectoryConfig
 from synapse.server import HomeServer
-from synapse.state.v2 import Clock
+from synapse.util import Clock
 
 from tests import unittest
 from tests.unittest import override_config