diff --git a/tests/storage/test_directory.py b/tests/storage/test_directory.py
index c4c321dda651930b657a9f16d7168871c9be781c..9a80bf6c048f89b5ac8a43a7f933d9f453259731 100644
--- a/tests/storage/test_directory.py
+++ b/tests/storage/test_directory.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from synapse.server import HomeServer
diff --git a/tests/storage/test_presence.py b/tests/storage/test_presence.py
index f3fab4fe794958824618a4d8fd95bcb1a1813388..9655d3cf4211e15e3d89e3c47ad9edaa5bcb8b7f 100644
--- a/tests/storage/test_presence.py
+++ b/tests/storage/test_presence.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from synapse.server import HomeServer
diff --git a/tests/storage/test_profile.py b/tests/storage/test_profile.py
index 1855278044c267fb17fa139bfa6760b87c8df1b8..21df2babdc38fc7676455a150bb24474aaa50004 100644
--- a/tests/storage/test_profile.py
+++ b/tests/storage/test_profile.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from synapse.server import HomeServer
diff --git a/tests/storage/test_registration.py b/tests/storage/test_registration.py
index 5e11ce3511103ed1f0cea5eed3421fe4fd0d89ce..91e221d53ef02df097773bc84cf579c934969f20 100644
--- a/tests/storage/test_registration.py
+++ b/tests/storage/test_registration.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from synapse.server import HomeServer
diff --git a/tests/storage/test_roommember.py b/tests/storage/test_roommember.py
index 5a6e93d4d1f68935178b24f8035a339a69b1d010..dd18291b4c0694f0dd8132705646601bc457724d 100644
--- a/tests/storage/test_roommember.py
+++ b/tests/storage/test_roommember.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from synapse.server import HomeServer