diff --git a/codeception.yml b/codeception.yml
index 405575a..20842c5 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -3,7 +3,7 @@ paths:
     tests: tests
     output: tests/_output
     data: tests/_data
-    support: tests/_support
+    support: tests
     envs: tests/_envs
 actor_suffix: Tester
 extensions:
diff --git a/composer.json b/composer.json
index e1dde98..9a8ee2f 100755
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Psalm\\PhpUnitPlugin\\Tests\\": ["tests/_support"]
+            "Psalm\\PhpUnitPlugin\\Tests\\": "tests"
         }
     },
     "scripts" : {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index ac7580c..08262e3 100755
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -6,8 +6,8 @@
 
     <!-- Paths to check -->
     <file>src</file>
-    <file>tests/_support/Helper</file>
-    <file>tests/_support/AcceptanceTester.php</file>
+    <file>tests/Helper</file>
+    <file>tests/AcceptanceTester.php</file>
 
 
     <!-- inherit rules from: -->
diff --git a/tests/_support/AcceptanceTester.php b/tests/AcceptanceTester.php
similarity index 100%
rename from tests/_support/AcceptanceTester.php
rename to tests/AcceptanceTester.php
diff --git a/tests/_support/Helper/Acceptance.php b/tests/Helper/Acceptance.php
similarity index 100%
rename from tests/_support/Helper/Acceptance.php
rename to tests/Helper/Acceptance.php
diff --git a/tests/_support/_generated/.gitignore b/tests/_generated/.gitignore
similarity index 100%
rename from tests/_support/_generated/.gitignore
rename to tests/_generated/.gitignore