diff --git a/test/api/__init__.py b/test/test_api/__init__.py
similarity index 100%
rename from test/api/__init__.py
rename to test/test_api/__init__.py
diff --git a/test/api/test_api.py b/test/test_api/test_api.py
similarity index 100%
rename from test/api/test_api.py
rename to test/test_api/test_api.py
diff --git a/test/api/test_api_classes.py b/test/test_api/test_api_classes.py
similarity index 100%
rename from test/api/test_api_classes.py
rename to test/test_api/test_api_classes.py
diff --git a/test/api/test_call_signatures.py b/test/test_api/test_call_signatures.py
similarity index 100%
rename from test/api/test_call_signatures.py
rename to test/test_api/test_call_signatures.py
diff --git a/test/api/test_defined_names.py b/test/test_api/test_defined_names.py
similarity index 100%
rename from test/api/test_defined_names.py
rename to test/test_api/test_defined_names.py
diff --git a/test/api/test_full_name.py b/test/test_api/test_full_name.py
similarity index 100%
rename from test/api/test_full_name.py
rename to test/test_api/test_full_name.py
diff --git a/test/api/test_interpreter.py b/test/test_api/test_interpreter.py
similarity index 100%
rename from test/api/test_interpreter.py
rename to test/test_api/test_interpreter.py
diff --git a/test/api/test_unicode.py b/test/test_api/test_unicode.py
similarity index 100%
rename from test/api/test_unicode.py
rename to test/test_api/test_unicode.py
diff --git a/test/evaluate/__init__.py b/test/test_evaluate/__init__.py
similarity index 100%
rename from test/evaluate/__init__.py
rename to test/test_evaluate/__init__.py
diff --git a/test/absolute_import/local_module.py b/test/test_evaluate/absolute_import/local_module.py
similarity index 100%
rename from test/absolute_import/local_module.py
rename to test/test_evaluate/absolute_import/local_module.py
diff --git a/test/absolute_import/unittest.py b/test/test_evaluate/absolute_import/unittest.py
similarity index 100%
rename from test/absolute_import/unittest.py
rename to test/test_evaluate/absolute_import/unittest.py
diff --git a/test/evaluate/namespace_package/ns1/pkg/__init__.py b/test/test_evaluate/namespace_package/ns1/pkg/__init__.py
similarity index 100%
rename from test/evaluate/namespace_package/ns1/pkg/__init__.py
rename to test/test_evaluate/namespace_package/ns1/pkg/__init__.py
diff --git a/test/evaluate/namespace_package/ns1/pkg/ns1_file.py b/test/test_evaluate/namespace_package/ns1/pkg/ns1_file.py
similarity index 100%
rename from test/evaluate/namespace_package/ns1/pkg/ns1_file.py
rename to test/test_evaluate/namespace_package/ns1/pkg/ns1_file.py
diff --git a/test/evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py b/test/test_evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py
similarity index 100%
rename from test/evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py
rename to test/test_evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py
diff --git a/test/evaluate/namespace_package/ns2/pkg/ns2_file.py b/test/test_evaluate/namespace_package/ns2/pkg/ns2_file.py
similarity index 100%
rename from test/evaluate/namespace_package/ns2/pkg/ns2_file.py
rename to test/test_evaluate/namespace_package/ns2/pkg/ns2_file.py
diff --git a/test/evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py b/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py
similarity index 100%
rename from test/evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py
rename to test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py
diff --git a/test/evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py b/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py
similarity index 100%
rename from test/evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py
rename to test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py
diff --git a/test/evaluate/not_in_sys_path/not_in_sys_path.py b/test/test_evaluate/not_in_sys_path/not_in_sys_path.py
similarity index 100%
rename from test/evaluate/not_in_sys_path/not_in_sys_path.py
rename to test/test_evaluate/not_in_sys_path/not_in_sys_path.py
diff --git a/test/evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py b/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py
similarity index 100%
rename from test/evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py
rename to test/test_evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py
diff --git a/test/evaluate/not_in_sys_path/not_in_sys_path_package/module.py b/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/module.py
similarity index 100%
rename from test/evaluate/not_in_sys_path/not_in_sys_path_package/module.py
rename to test/test_evaluate/not_in_sys_path/not_in_sys_path_package/module.py
diff --git a/test/evaluate/not_in_sys_path/pkg/module.py b/test/test_evaluate/not_in_sys_path/pkg/module.py
similarity index 100%
rename from test/evaluate/not_in_sys_path/pkg/module.py
rename to test/test_evaluate/not_in_sys_path/pkg/module.py
diff --git a/test/evaluate/test_absolute_import.py b/test/test_evaluate/test_absolute_import.py
similarity index 95%
rename from test/evaluate/test_absolute_import.py
rename to test/test_evaluate/test_absolute_import.py
index e4caa2ee..f274ac33 100644
--- a/test/evaluate/test_absolute_import.py
+++ b/test/test_evaluate/test_absolute_import.py
@@ -33,7 +33,7 @@ def test_dont_break_imports_without_namespaces():
     assert parser.module.has_explicit_absolute_import
 
 
-@helpers.cwd_at("test/absolute_import")
+@helpers.cwd_at("test/test_evaluate/absolute_import")
 def test_can_complete_when_shadowing():
     script = jedi.Script(path="unittest.py")
     assert script.completions()
diff --git a/test/evaluate/test_compiled.py b/test/test_evaluate/test_compiled.py
similarity index 100%
rename from test/evaluate/test_compiled.py
rename to test/test_evaluate/test_compiled.py
diff --git a/test/evaluate/test_docstring.py b/test/test_evaluate/test_docstring.py
similarity index 100%
rename from test/evaluate/test_docstring.py
rename to test/test_evaluate/test_docstring.py
diff --git a/test/evaluate/test_imports.py b/test/test_evaluate/test_imports.py
similarity index 93%
rename from test/evaluate/test_imports.py
rename to test/test_evaluate/test_imports.py
index 24783fa8..c9483733 100644
--- a/test/evaluate/test_imports.py
+++ b/test/test_evaluate/test_imports.py
@@ -12,7 +12,7 @@ def test_find_module_py33():
     assert find_module_py33('_io') == (None, '_io', False)
 
 
-@cwd_at('test/evaluate/not_in_sys_path/pkg')
+@cwd_at('test/test_evaluate/not_in_sys_path/pkg')
 def test_import_not_in_sys_path():
     """
     non-direct imports (not in sys.path)
diff --git a/test/evaluate/test_namespace_package.py b/test/test_evaluate/test_namespace_package.py
similarity index 100%
rename from test/evaluate/test_namespace_package.py
rename to test/test_evaluate/test_namespace_package.py
diff --git a/test/parser/__init__.py b/test/test_parser/__init__.py
similarity index 100%
rename from test/parser/__init__.py
rename to test/test_parser/__init__.py
diff --git a/test/parser/test_fast_parser.py b/test/test_parser/test_fast_parser.py
similarity index 100%
rename from test/parser/test_fast_parser.py
rename to test/test_parser/test_fast_parser.py
diff --git a/test/parser/test_parsing.py b/test/test_parser/test_parsing.py
similarity index 100%
rename from test/parser/test_parsing.py
rename to test/test_parser/test_parsing.py
diff --git a/test/parser/test_parsing_representation.py b/test/test_parser/test_parsing_representation.py
similarity index 100%
rename from test/parser/test_parsing_representation.py
rename to test/test_parser/test_parsing_representation.py
diff --git a/test/parser/test_token.py b/test/test_parser/test_token.py
similarity index 100%
rename from test/parser/test_token.py
rename to test/test_parser/test_token.py