diff --git a/test/namespace_package/ns1/pkg/__init__.py b/test/evaluate/namespace_package/ns1/pkg/__init__.py
similarity index 100%
rename from test/namespace_package/ns1/pkg/__init__.py
rename to test/evaluate/namespace_package/ns1/pkg/__init__.py
diff --git a/test/namespace_package/ns1/pkg/ns1_file.py b/test/evaluate/namespace_package/ns1/pkg/ns1_file.py
similarity index 100%
rename from test/namespace_package/ns1/pkg/ns1_file.py
rename to test/evaluate/namespace_package/ns1/pkg/ns1_file.py
diff --git a/test/namespace_package/ns1/pkg/ns1_folder/__init__.py b/test/evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py
similarity index 100%
rename from test/namespace_package/ns1/pkg/ns1_folder/__init__.py
rename to test/evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py
diff --git a/test/namespace_package/ns2/pkg/ns2_file.py b/test/evaluate/namespace_package/ns2/pkg/ns2_file.py
similarity index 100%
rename from test/namespace_package/ns2/pkg/ns2_file.py
rename to test/evaluate/namespace_package/ns2/pkg/ns2_file.py
diff --git a/test/namespace_package/ns2/pkg/ns2_folder/__init__.py b/test/evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py
similarity index 100%
rename from test/namespace_package/ns2/pkg/ns2_folder/__init__.py
rename to test/evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py
diff --git a/test/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py b/test/evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py
similarity index 100%
rename from test/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py
rename to test/evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py
diff --git a/test/not_in_sys_path/not_in_sys_path.py b/test/evaluate/not_in_sys_path/not_in_sys_path.py
similarity index 100%
rename from test/not_in_sys_path/not_in_sys_path.py
rename to test/evaluate/not_in_sys_path/not_in_sys_path.py
diff --git a/test/not_in_sys_path/not_in_sys_path_package/__init__.py b/test/evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py
similarity index 100%
rename from test/not_in_sys_path/not_in_sys_path_package/__init__.py
rename to test/evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py
diff --git a/test/not_in_sys_path/not_in_sys_path_package/module.py b/test/evaluate/not_in_sys_path/not_in_sys_path_package/module.py
similarity index 100%
rename from test/not_in_sys_path/not_in_sys_path_package/module.py
rename to test/evaluate/not_in_sys_path/not_in_sys_path_package/module.py
diff --git a/test/not_in_sys_path/pkg/module.py b/test/evaluate/not_in_sys_path/pkg/module.py
similarity index 100%
rename from test/not_in_sys_path/pkg/module.py
rename to test/evaluate/not_in_sys_path/pkg/module.py
diff --git a/test/evaluate/test_imports.py b/test/evaluate/test_imports.py
index 1b5c5832..24783fa8 100644
--- a/test/evaluate/test_imports.py
+++ b/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/not_in_sys_path/pkg')
+@cwd_at('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/test_namespace_package.py b/test/evaluate/test_namespace_package.py
similarity index 100%
rename from test/test_namespace_package.py
rename to test/evaluate/test_namespace_package.py
diff --git a/test/test_parsing.py b/test/parser/test_parsing.py
similarity index 100%
rename from test/test_parsing.py
rename to test/parser/test_parsing.py
diff --git a/test/test_parsing_representation.py b/test/parser/test_parsing_representation.py
similarity index 100%
rename from test/test_parsing_representation.py
rename to test/parser/test_parsing_representation.py
diff --git a/test/test_token.py b/test/parser/test_token.py
similarity index 100%
rename from test/test_token.py
rename to test/parser/test_token.py