diff --git a/terminatorlib/tests/test_doctests.py b/terminatorlib/tests/test_doctests.py
index ff5165c4..cb63ece0 100644
--- a/terminatorlib/tests/test_doctests.py
+++ b/terminatorlib/tests/test_doctests.py
@@ -7,11 +7,11 @@ def test_suite():
     for name in (
         'config',
         'plugin',
-        'testborg',
         'cwd',
         'factory',
         'util',
-        'testsignalman',
+        'tests.testborg',
+        'tests.testsignalman',
         ):
         suite.addTest(DocTestSuite('terminatorlib.' + name))
     return suite
diff --git a/terminatorlib/testborg.py b/terminatorlib/tests/testborg.py
similarity index 97%
rename from terminatorlib/testborg.py
rename to terminatorlib/tests/testborg.py
index 0dbc5df9..634f74da 100755
--- a/terminatorlib/testborg.py
+++ b/terminatorlib/tests/testborg.py
@@ -29,7 +29,7 @@
 
 """
 
-from borg import Borg
+from ..borg import Borg
 
 class TestBorg(Borg):
     attribute = None
diff --git a/terminatorlib/testsignalman.py b/terminatorlib/tests/testsignalman.py
similarity index 97%
rename from terminatorlib/testsignalman.py
rename to terminatorlib/tests/testsignalman.py
index 8aa6971e..ff6450a2 100755
--- a/terminatorlib/testsignalman.py
+++ b/terminatorlib/tests/testsignalman.py
@@ -27,7 +27,7 @@ False
 
 """
 
-from signalman import Signalman
+from ..signalman import Signalman
 
 class TestWidget():
     signals = None