1 files changed, 22 insertions, 15 deletions
diff --git a/lib/testtools/testtools/tests/__init__.py b/lib/testtools/testtools/tests/__init__.py
index 5e22000bb4..ac3c218de9 100644
--- a/lib/testtools/testtools/tests/__init__.py
+++ b/lib/testtools/testtools/tests/__init__.py
@@ -3,32 +3,39 @@
 # See README for copyright and licensing details.
 
 import unittest
-from testtools.tests import (
-    test_compat,
-    test_content,
-    test_content_type,
-    test_matchers,
-    test_monkey,
-    test_runtest,
-    test_testtools,
-    test_testresult,
-    test_testsuite,
-    )
 
 
 def test_suite():
-    suites = []
-    modules = [
+    from testtools.tests import (
         test_compat,
         test_content,
         test_content_type,
+        test_deferredruntest,
+        test_fixturesupport,
+        test_helpers,
         test_matchers,
         test_monkey,
+        test_run,
         test_runtest,
+        test_spinner,
+        test_testtools,
+        test_testresult,
+        test_testsuite,
+        )
+    modules = [
+        test_compat,
+        test_content,
+        test_content_type,
+        test_deferredruntest,
+        test_fixturesupport,
+        test_helpers,
+        test_matchers,
+        test_monkey,
+        test_run,
+        test_spinner,
         test_testresult,
         test_testsuite,
         test_testtools,
         ]
-    for module in modules:
-        suites.append(getattr(module, 'test_suite')())
+    suites = map(lambda x:x.test_suite(), modules)
     return unittest.TestSuite(suites)