diff --git a/Makefile b/Makefile
index f831bbe..791de0e 100644
--- a/Makefile
+++ b/Makefile
@@ -146,8 +146,8 @@ php-cs-fixer-apply: ## Execute php-cs-fixer and apply changes
 ## —— ✨ Tests ——
 .PHONY: tests
 tests: ## Execute tests
-	$(APP) vendor/bin/simple-phpunit  --colors=always --testdox
-	$(APP) vendor/bin/behat
+	$(APP) vendor/bin/simple-phpunit --configuration ./tests/phpunit.xml.dist --colors=always --testdox
+	$(APP) vendor/bin/behat --config ./tests/behat.yml
 
 ##
 ## —— ✨ Others ——
diff --git a/behat.yml.dist b/tests/behat.yml
similarity index 81%
rename from behat.yml.dist
rename to tests/behat.yml
index 3bc9081..766e94e 100644
--- a/behat.yml.dist
+++ b/tests/behat.yml
@@ -1,6 +1,8 @@
 default:
   suites:
     default:
+      paths:
+        features: features
       contexts:
         - App\Tests\Behat\DemoContext
 
diff --git a/phpunit.xml.dist b/tests/phpunit.xml.dist
similarity index 86%
rename from phpunit.xml.dist
rename to tests/phpunit.xml.dist
index cde8bd8..08d9095 100755
--- a/phpunit.xml.dist
+++ b/tests/phpunit.xml.dist
@@ -2,10 +2,10 @@
 
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="../vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="./bootstrap.php"
          convertDeprecationsToExceptions="false"
 >
     <php>
@@ -19,7 +19,7 @@
 
     <testsuites>
         <testsuite name="Project Test Suite">
-            <directory>tests</directory>
+            <directory>./</directory>
         </testsuite>
     </testsuites>