diff --git a/composer.json b/composer.json
index e41b3caa5a..e00c4a2732 100644
--- a/composer.json
+++ b/composer.json
@@ -72,7 +72,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Zephir\\Test\\": "tests/Zephir/Test/",
+            "Zephir\\Test\\": "tests/Zephir/",
             "Extension\\": "tests/Extension/"
         },
         "classmap": [
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b818536c10..e0e2f8a651 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -25,7 +25,7 @@
 
         <testsuite name="Zephir">
             <directory suffix=".php">./tests/Zephir</directory>
-            <exclude>tests/Zephir/Test/KernelTestCase.php</exclude>
+            <exclude>tests/Zephir/KernelTestCase.php</exclude>
         </testsuite>
     </testsuites>
 
diff --git a/tests/Zephir/Test/AliasManagerTest.php b/tests/Zephir/AliasManagerTest.php
similarity index 100%
rename from tests/Zephir/Test/AliasManagerTest.php
rename to tests/Zephir/AliasManagerTest.php
diff --git a/tests/Zephir/Test/Backends/ZendEngine3/BackendTest.php b/tests/Zephir/Backends/ZendEngine3/BackendTest.php
similarity index 100%
rename from tests/Zephir/Test/Backends/ZendEngine3/BackendTest.php
rename to tests/Zephir/Backends/ZendEngine3/BackendTest.php
diff --git a/tests/Zephir/Test/CompilerFile/CheckDependenciesTest.php b/tests/Zephir/CompilerFile/CheckDependenciesTest.php
similarity index 95%
rename from tests/Zephir/Test/CompilerFile/CheckDependenciesTest.php
rename to tests/Zephir/CompilerFile/CheckDependenciesTest.php
index 6dff45ab19..1764fba421 100644
--- a/tests/Zephir/Test/CompilerFile/CheckDependenciesTest.php
+++ b/tests/Zephir/CompilerFile/CheckDependenciesTest.php
@@ -23,7 +23,7 @@ class CheckDependenciesTest extends KernelTestCase
 {
     public function testExtendsClassThatDoesNotExist()
     {
-        self::bootKernel(['config_files' => [__DIR__.'/../../../config.yml']]);
+        self::bootKernel(['config_files' => [__DIR__ . '/../../config.yml']]);
 
         $logger = new TestLogger();
 
diff --git a/tests/Zephir/Test/ConfigExceptionTest.php b/tests/Zephir/ConfigExceptionTest.php
similarity index 100%
rename from tests/Zephir/Test/ConfigExceptionTest.php
rename to tests/Zephir/ConfigExceptionTest.php
diff --git a/tests/Zephir/Test/ConfigTest.php b/tests/Zephir/ConfigTest.php
similarity index 100%
rename from tests/Zephir/Test/ConfigTest.php
rename to tests/Zephir/ConfigTest.php
diff --git a/tests/Zephir/Test/Documentation/Annotation/LinkTest.php b/tests/Zephir/Documentation/Annotation/LinkTest.php
similarity index 100%
rename from tests/Zephir/Test/Documentation/Annotation/LinkTest.php
rename to tests/Zephir/Documentation/Annotation/LinkTest.php
diff --git a/tests/Zephir/Test/Documentation/Annotation/ReturnAnnotationTest.php b/tests/Zephir/Documentation/Annotation/ReturnAnnotationTest.php
similarity index 100%
rename from tests/Zephir/Test/Documentation/Annotation/ReturnAnnotationTest.php
rename to tests/Zephir/Documentation/Annotation/ReturnAnnotationTest.php
diff --git a/tests/Zephir/Test/Documentation/Annotation/SeeTest.php b/tests/Zephir/Documentation/Annotation/SeeTest.php
similarity index 100%
rename from tests/Zephir/Test/Documentation/Annotation/SeeTest.php
rename to tests/Zephir/Documentation/Annotation/SeeTest.php
diff --git a/tests/Zephir/Test/Documentation/AnnotationTest.php b/tests/Zephir/Documentation/AnnotationTest.php
similarity index 100%
rename from tests/Zephir/Test/Documentation/AnnotationTest.php
rename to tests/Zephir/Documentation/AnnotationTest.php
diff --git a/tests/Zephir/Test/Documentation/DocblockParserTest.php b/tests/Zephir/Documentation/DocblockParserTest.php
similarity index 100%
rename from tests/Zephir/Test/Documentation/DocblockParserTest.php
rename to tests/Zephir/Documentation/DocblockParserTest.php
diff --git a/tests/Zephir/Test/Documentation/DocblockTest.php b/tests/Zephir/Documentation/DocblockTest.php
similarity index 100%
rename from tests/Zephir/Test/Documentation/DocblockTest.php
rename to tests/Zephir/Documentation/DocblockTest.php
diff --git a/tests/Zephir/Test/FunctionLike/ReturnType/CastHintTest.php b/tests/Zephir/FunctionLike/ReturnType/CastHintTest.php
similarity index 100%
rename from tests/Zephir/Test/FunctionLike/ReturnType/CastHintTest.php
rename to tests/Zephir/FunctionLike/ReturnType/CastHintTest.php
diff --git a/tests/Zephir/Test/FunctionLike/ReturnType/CollectionTest.php b/tests/Zephir/FunctionLike/ReturnType/CollectionTest.php
similarity index 100%
rename from tests/Zephir/Test/FunctionLike/ReturnType/CollectionTest.php
rename to tests/Zephir/FunctionLike/ReturnType/CollectionTest.php
diff --git a/tests/Zephir/Test/FunctionLike/ReturnType/FactoryTest.php b/tests/Zephir/FunctionLike/ReturnType/FactoryTest.php
similarity index 100%
rename from tests/Zephir/Test/FunctionLike/ReturnType/FactoryTest.php
rename to tests/Zephir/FunctionLike/ReturnType/FactoryTest.php
diff --git a/tests/Zephir/Test/FunctionLike/ReturnType/RealTypeTest.php b/tests/Zephir/FunctionLike/ReturnType/RealTypeTest.php
similarity index 100%
rename from tests/Zephir/Test/FunctionLike/ReturnType/RealTypeTest.php
rename to tests/Zephir/FunctionLike/ReturnType/RealTypeTest.php
diff --git a/tests/Zephir/Test/HelpersTest.php b/tests/Zephir/HelpersTest.php
similarity index 100%
rename from tests/Zephir/Test/HelpersTest.php
rename to tests/Zephir/HelpersTest.php
diff --git a/tests/Zephir/Test/KernelTestCase.php b/tests/Zephir/KernelTestCase.php
similarity index 100%
rename from tests/Zephir/Test/KernelTestCase.php
rename to tests/Zephir/KernelTestCase.php
diff --git a/tests/Zephir/Test/Logger/Formatter/CompilerFormatterTest.php b/tests/Zephir/Logger/Formatter/CompilerFormatterTest.php
similarity index 100%
rename from tests/Zephir/Test/Logger/Formatter/CompilerFormatterTest.php
rename to tests/Zephir/Logger/Formatter/CompilerFormatterTest.php
diff --git a/tests/Zephir/Test/Optimizers/FunctionCall/PregMatchOptimizerTest.php b/tests/Zephir/Optimizers/FunctionCall/PregMatchOptimizerTest.php
similarity index 100%
rename from tests/Zephir/Test/Optimizers/FunctionCall/PregMatchOptimizerTest.php
rename to tests/Zephir/Optimizers/FunctionCall/PregMatchOptimizerTest.php
diff --git a/tests/Zephir/Test/Stubs/DocBlockTest.php b/tests/Zephir/Stubs/DocBlockTest.php
similarity index 100%
rename from tests/Zephir/Test/Stubs/DocBlockTest.php
rename to tests/Zephir/Stubs/DocBlockTest.php
diff --git a/tests/Zephir/Test/Stubs/GeneratorTest.php b/tests/Zephir/Stubs/GeneratorTest.php
similarity index 100%
rename from tests/Zephir/Test/Stubs/GeneratorTest.php
rename to tests/Zephir/Stubs/GeneratorTest.php
diff --git a/tests/Zephir/Test/Stubs/MethodDocBlockTest.php b/tests/Zephir/Stubs/MethodDocBlockTest.php
similarity index 100%
rename from tests/Zephir/Test/Stubs/MethodDocBlockTest.php
rename to tests/Zephir/Stubs/MethodDocBlockTest.php
diff --git a/tests/Zephir/Test/TypesTest.php b/tests/Zephir/TypesTest.php
similarity index 100%
rename from tests/Zephir/Test/TypesTest.php
rename to tests/Zephir/TypesTest.php