diff --git a/.gitignore b/.gitignore
index e849f161..1492c159 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@
 *.pyo
 *~
 docs/_build
+tests/temp
+tests/data/pygccxml.cache
+tests/data/directory_cache_test
+tests/data/ogre.1.7.xml
 unittests/temp
 unittests/data/pygccxml.cache
 unittests/data/directory_cache_test
diff --git a/tests/text_reader_tester.py b/tests/test_text_reader.py
similarity index 100%
rename from tests/text_reader_tester.py
rename to tests/test_text_reader.py
diff --git a/unittests/type_as_exception_bug_tester.py b/tests/test_type_as_exception_bug.py
similarity index 100%
rename from unittests/type_as_exception_bug_tester.py
rename to tests/test_type_as_exception_bug.py
diff --git a/unittests/type_traits_tester.py b/tests/test_type_traits.py
similarity index 100%
rename from unittests/type_traits_tester.py
rename to tests/test_type_traits.py
diff --git a/unittests/typedefs_tester.py b/tests/test_typedefs.py
similarity index 100%
rename from unittests/typedefs_tester.py
rename to tests/test_typedefs.py
diff --git a/unittests/unnamed_classes_tester.py b/tests/test_unnamed_classes.py
similarity index 100%
rename from unittests/unnamed_classes_tester.py
rename to tests/test_unnamed_classes.py
diff --git a/unittests/unnamed_enums_bug_tester.py b/tests/test_unnamed_enums_bug.py
similarity index 100%
rename from unittests/unnamed_enums_bug_tester.py
rename to tests/test_unnamed_enums_bug.py
diff --git a/unittests/variable_matcher_tester.py b/tests/test_variable_matcher.py
similarity index 100%
rename from unittests/variable_matcher_tester.py
rename to tests/test_variable_matcher.py
diff --git a/unittests/xmlfile_reader_tester.py b/tests/test_xmlfile_reader.py
similarity index 98%
rename from unittests/xmlfile_reader_tester.py
rename to tests/test_xmlfile_reader.py
index 8024d2fb..e22a3688 100644
--- a/unittests/xmlfile_reader_tester.py
+++ b/tests/test_xmlfile_reader.py
@@ -20,7 +20,7 @@ def __init__(self, *args):
         self.__fname = 'core_types.hpp'
         # self.__fname = 'merge_free_functions.hpp'
 
-    def test(self):
+    def test_read_xml_file(self):
         src_reader = parser.source_reader_t(self.config)
         src_decls = src_reader.read_file(self.__fname)
 
diff --git a/unittests/test_all.py b/unittests/test_all.py
index e60f4d67..60d3cf96 100644
--- a/unittests/test_all.py
+++ b/unittests/test_all.py
@@ -72,27 +72,22 @@
     start_with_declarations_tester,
     templates_tester,
     core_tester,
-    xmlfile_reader_tester,
     hierarchy_traveling,
     call_invocation_tester,
     bit_fields_tester,
     complex_types_tester,
     cached_source_file_tester,
-    variable_matcher_tester,
     namespace_matcher_tester,
     calldef_matcher_tester,
     filters_tester,
     cache_enums_tester,
-    typedefs_tester,
     non_copyable_classes_tester,
-    unnamed_enums_bug_tester,
     vector_traits_tester,
     string_traits_tester,
     declarations_cache_tester,
     has_binary_operator_traits_tester,
     dependencies_tester,
     free_operators_tester,
-    type_as_exception_bug_tester,
     plain_c_tester,
     function_traits_tester,
     better_templates_matcher_tester,
@@ -102,10 +97,8 @@
     gccxml10184_tester,
     gccxml10185_tester,
     inline_specifier_tester,
-    unnamed_classes_tester,
     test_directory_cache,
     decl_printer_tester,
-    type_traits_tester,
     remove_template_defaults_tester,
     patcher_tester,
     find_container_traits_tester,