diff --git a/unittests/test_argument_without_name.py b/tests/test_argument_without_name.py
similarity index 100%
rename from unittests/test_argument_without_name.py
rename to tests/test_argument_without_name.py
diff --git a/unittests/test_castxml_wrong_epic.py b/tests/test_castxml_wrong_epic.py
similarity index 100%
rename from unittests/test_castxml_wrong_epic.py
rename to tests/test_castxml_wrong_epic.py
diff --git a/unittests/test_ccflags.py b/tests/test_ccflags.py
similarity index 100%
rename from unittests/test_ccflags.py
rename to tests/test_ccflags.py
diff --git a/unittests/test_comments.py b/tests/test_comments.py
similarity index 100%
rename from unittests/test_comments.py
rename to tests/test_comments.py
diff --git a/unittests/test_copy_constructor.py b/tests/test_copy_constructor.py
similarity index 100%
rename from unittests/test_copy_constructor.py
rename to tests/test_copy_constructor.py
diff --git a/unittests/test_cpp_standards.py b/tests/test_cpp_standards.py
similarity index 100%
rename from unittests/test_cpp_standards.py
rename to tests/test_cpp_standards.py
diff --git a/unittests/test_create_decl_string.py b/tests/test_create_decl_string.py
similarity index 100%
rename from unittests/test_create_decl_string.py
rename to tests/test_create_decl_string.py
diff --git a/unittests/test_deprecation.py b/tests/test_deprecation.py
similarity index 100%
rename from unittests/test_deprecation.py
rename to tests/test_deprecation.py
diff --git a/unittests/test_elaborated_types.py b/tests/test_elaborated_types.py
similarity index 100%
rename from unittests/test_elaborated_types.py
rename to tests/test_elaborated_types.py
diff --git a/unittests/test_find_noncopyable_vars.py b/tests/test_find_noncopyable_vars.py
similarity index 100%
rename from unittests/test_find_noncopyable_vars.py
rename to tests/test_find_noncopyable_vars.py
diff --git a/unittests/test_function_pointer.py b/tests/test_function_pointer.py
similarity index 100%
rename from unittests/test_function_pointer.py
rename to tests/test_function_pointer.py
diff --git a/unittests/test_hash.py b/tests/test_hash.py
similarity index 100%
rename from unittests/test_hash.py
rename to tests/test_hash.py
diff --git a/unittests/test_map_gcc5.py b/tests/test_map_gcc5.py
similarity index 100%
rename from unittests/test_map_gcc5.py
rename to tests/test_map_gcc5.py
diff --git a/unittests/test_non_copyable_recursive.py b/tests/test_non_copyable_recursive.py
similarity index 100%
rename from unittests/test_non_copyable_recursive.py
rename to tests/test_non_copyable_recursive.py
diff --git a/unittests/test_null_comparison.py b/tests/test_null_comparison.py
similarity index 100%
rename from unittests/test_null_comparison.py
rename to tests/test_null_comparison.py
diff --git a/unittests/test_order.py b/tests/test_order.py
similarity index 100%
rename from unittests/test_order.py
rename to tests/test_order.py
diff --git a/unittests/test_pattern_parser.py b/tests/test_pattern_parser.py
similarity index 100%
rename from unittests/test_pattern_parser.py
rename to tests/test_pattern_parser.py
diff --git a/unittests/test_smart_pointer.py b/tests/test_smart_pointer.py
similarity index 100%
rename from unittests/test_smart_pointer.py
rename to tests/test_smart_pointer.py
diff --git a/unittests/test_va_list_tag_removal.py b/tests/test_va_list_tag_removal.py
similarity index 100%
rename from unittests/test_va_list_tag_removal.py
rename to tests/test_va_list_tag_removal.py
diff --git a/unittests/test_warn_missing_include_dirs.py b/tests/test_warn_missing_include_dirs.py
similarity index 100%
rename from unittests/test_warn_missing_include_dirs.py
rename to tests/test_warn_missing_include_dirs.py
diff --git a/unittests/test_xml_generators.py b/tests/test_xml_generators.py
similarity index 100%
rename from unittests/test_xml_generators.py
rename to tests/test_xml_generators.py
diff --git a/unittests/text_reader_tester.py b/tests/text_reader_tester.py
similarity index 100%
rename from unittests/text_reader_tester.py
rename to tests/text_reader_tester.py
diff --git a/unittests/test_all.py b/unittests/test_all.py
index 18d48e5e..e60f4d67 100644
--- a/unittests/test_all.py
+++ b/unittests/test_all.py
@@ -21,7 +21,6 @@
 from . import type_traits_tester
 from . import core_tester
 from . import xmlfile_reader_tester
-from . import text_reader_tester
 from . import hierarchy_traveling
 from . import patcher_tester
 from . import call_invocation_tester
@@ -56,32 +55,11 @@
 from . import gccxml10184_tester
 from . import gccxml10185_tester
 from . import inline_specifier_tester
-from . import test_create_decl_string
 from . import example_tester
-from . import test_va_list_tag_removal
-from . import test_copy_constructor
-from . import test_cpp_standards
 from . import unnamed_classes_tester
-from . import test_map_gcc5
-from . import test_argument_without_name
-from . import test_smart_pointer
-from . import test_pattern_parser
-from . import test_function_pointer
 from . import test_directory_cache
 from . import deprecation_tester
-from . import test_xml_generators
-from . import test_non_copyable_recursive
-from . import test_castxml_wrong_epic
-from . import test_elaborated_types
-from . import test_order
-from . import test_find_noncopyable_vars
-from . import test_hash
-from . import test_null_comparison
-from . import test_comments
-from . import test_deprecation
-from . import test_warn_missing_include_dirs
 from . import test_overrides
-from . import test_ccflags
 
 testers = [
     decl_string_tester,
@@ -95,7 +73,6 @@
     templates_tester,
     core_tester,
     xmlfile_reader_tester,
-    text_reader_tester,
     hierarchy_traveling,
     call_invocation_tester,
     bit_fields_tester,
@@ -125,34 +102,14 @@
     gccxml10184_tester,
     gccxml10185_tester,
     inline_specifier_tester,
-    test_create_decl_string,
-    test_copy_constructor,
     unnamed_classes_tester,
-    test_map_gcc5,
-    test_argument_without_name,
-    test_smart_pointer,
-    test_pattern_parser,
-    test_function_pointer,
     test_directory_cache,
-    test_cpp_standards,
-    test_va_list_tag_removal,
     decl_printer_tester,
     type_traits_tester,
     remove_template_defaults_tester,
     patcher_tester,
     find_container_traits_tester,
     deprecation_tester,
-    test_xml_generators,
-    test_non_copyable_recursive,
-    test_castxml_wrong_epic,
-    test_elaborated_types,
-    test_order,
-    test_find_noncopyable_vars,
-    test_hash,
-    test_null_comparison,
-    test_comments,
-    test_deprecation,
-    test_warn_missing_include_dirs,
     test_overrides,
 ]
 
@@ -160,9 +117,6 @@
     # Known to fail under windows with VS2013
     testers.append(example_tester)
 
-    # Awaiting Windows CI machine
-    testers.append(test_ccflags)
-
 if 'posix' in os.name:
     testers.append(copy_constructor_tester)