diff --git a/unittests/complex_types_tester.py b/tests/test_complex_types.py
similarity index 100%
rename from unittests/complex_types_tester.py
rename to tests/test_complex_types.py
diff --git a/unittests/declaration_matcher_tester.py b/tests/test_declaration_matcher.py
similarity index 100%
rename from unittests/declaration_matcher_tester.py
rename to tests/test_declaration_matcher.py
diff --git a/unittests/remove_template_defaults_tester.py b/tests/test_remove_template_defaults.py
similarity index 100%
rename from unittests/remove_template_defaults_tester.py
rename to tests/test_remove_template_defaults.py
diff --git a/unittests/source_reader_tester.py b/tests/test_source_reader.py
similarity index 100%
rename from unittests/source_reader_tester.py
rename to tests/test_source_reader.py
diff --git a/unittests/start_with_declarations_tester.py b/tests/test_start_with_declarations.py
similarity index 100%
rename from unittests/start_with_declarations_tester.py
rename to tests/test_start_with_declarations.py
diff --git a/unittests/string_traits_tester.py b/tests/test_string_traits.py
similarity index 100%
rename from unittests/string_traits_tester.py
rename to tests/test_string_traits.py
diff --git a/unittests/test_all.py b/unittests/test_all.py
index 5221b4fe..52d38bb8 100644
--- a/unittests/test_all.py
+++ b/unittests/test_all.py
@@ -9,36 +9,24 @@
 
 from . import declarations_tester
 from . import gccxml_runner_tester
-from . import source_reader_tester
-from . import start_with_declarations_tester
 from . import hierarchy_traveling
 from . import patcher_tester
-from . import complex_types_tester
 from . import non_copyable_classes_tester
 from . import vector_traits_tester
-from . import string_traits_tester
 from . import dependencies_tester
-from . import remove_template_defaults_tester
 from . import find_container_traits_tester
-from . import declaration_matcher_tester
 from . import gccxml10184_tester
 from . import gccxml10185_tester
 
 testers = [
     declarations_tester,
     gccxml_runner_tester,
-    source_reader_tester,
-    start_with_declarations_tester,
     hierarchy_traveling,
-    complex_types_tester,
     non_copyable_classes_tester,
     vector_traits_tester,
-    string_traits_tester,
     dependencies_tester,
-    declaration_matcher_tester,
     gccxml10184_tester,
     gccxml10185_tester,
-    remove_template_defaults_tester,
     patcher_tester,
     find_container_traits_tester,
 ]