diff --git a/Tests/Fixtures/App/AppKernel.php b/Resources/test/Fixtures/App/app/AppKernel.php
similarity index 100%
rename from Tests/Fixtures/App/AppKernel.php
rename to Resources/test/Fixtures/App/app/AppKernel.php
diff --git a/Tests/Fixtures/App/DoctrineMigrations/.gitignore b/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore
similarity index 100%
rename from Tests/Fixtures/App/DoctrineMigrations/.gitignore
rename to Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore
diff --git a/Tests/Fixtures/App/Resources/views/base.html.twig b/Resources/test/Fixtures/App/app/Resources/views/base.html.twig
similarity index 100%
rename from Tests/Fixtures/App/Resources/views/base.html.twig
rename to Resources/test/Fixtures/App/app/Resources/views/base.html.twig
diff --git a/Resources/test/Fixtures/App/app/autoload.php b/Resources/test/Fixtures/App/app/autoload.php
new file mode 100644
index 000000000..39dc0e2ba
--- /dev/null
+++ b/Resources/test/Fixtures/App/app/autoload.php
@@ -0,0 +1,11 @@
+<?php
+
+use Doctrine\Common\Annotations\AnnotationRegistry;
+use Composer\Autoload\ClassLoader;
+
+/** @var ClassLoader $loader */
+$loader = require __DIR__.'/../../../../../vendor/autoload.php';
+
+AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+
+return $loader;
diff --git a/Tests/Fixtures/App/config/config.yml b/Resources/test/Fixtures/App/app/config/config.yml
similarity index 100%
rename from Tests/Fixtures/App/config/config.yml
rename to Resources/test/Fixtures/App/app/config/config.yml
diff --git a/Tests/Fixtures/App/config/config_test.yml b/Resources/test/Fixtures/App/app/config/config_test.yml
similarity index 100%
rename from Tests/Fixtures/App/config/config_test.yml
rename to Resources/test/Fixtures/App/app/config/config_test.yml
diff --git a/Tests/Fixtures/App/config/parameters.gitlab-ci.yml b/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml
similarity index 100%
rename from Tests/Fixtures/App/config/parameters.gitlab-ci.yml
rename to Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml
diff --git a/Tests/Fixtures/App/config/parameters.yml.dist b/Resources/test/Fixtures/App/app/config/parameters.yml.dist
similarity index 100%
rename from Tests/Fixtures/App/config/parameters.yml.dist
rename to Resources/test/Fixtures/App/app/config/parameters.yml.dist
diff --git a/Tests/Fixtures/App/config/routing.yml b/Resources/test/Fixtures/App/app/config/routing.yml
similarity index 100%
rename from Tests/Fixtures/App/config/routing.yml
rename to Resources/test/Fixtures/App/app/config/routing.yml
diff --git a/Tests/Fixtures/App/console b/Resources/test/Fixtures/App/app/console
similarity index 77%
rename from Tests/Fixtures/App/console
rename to Resources/test/Fixtures/App/app/console
index 2b45f964b..f6fd8e5ef 100644
--- a/Tests/Fixtures/App/console
+++ b/Resources/test/Fixtures/App/app/console
@@ -1,19 +1,19 @@
 #!/usr/bin/env php
 <?php
 
-// if you don't want to setup permissions the proper way, just uncomment the following PHP line
-// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
-//umask(0000);
-
-set_time_limit(0);
-
-require_once __DIR__.'/../../bootstrap.php';
-require_once __DIR__.'/AppKernel.php';
-
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Debug\Debug;
 
+// if you don't want to setup permissions the proper way, just uncomment the following PHP line
+// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
+// for more information
+//umask(0000);
+
+set_time_limit(0);
+
+require __DIR__.'/autoload.php';
+
 $input = new ArgvInput();
 $env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
 $debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
diff --git a/Tests/Fixtures/Resources/views/menus/fakeTemplate.html.twig b/Resources/test/Fixtures/Resources/views/menus/fakeTemplate.html.twig
similarity index 100%
rename from Tests/Fixtures/Resources/views/menus/fakeTemplate.html.twig
rename to Resources/test/Fixtures/Resources/views/menus/fakeTemplate.html.twig
diff --git a/Tests/Fixtures/Resources/views/menus/normalMenu.html.twig b/Resources/test/Fixtures/Resources/views/menus/normalMenu.html.twig
similarity index 100%
rename from Tests/Fixtures/Resources/views/menus/normalMenu.html.twig
rename to Resources/test/Fixtures/Resources/views/menus/normalMenu.html.twig
diff --git a/Tests/Fixtures/Resources/views/menus/overrideTemplate.html.twig b/Resources/test/Fixtures/Resources/views/menus/overrideTemplate.html.twig
similarity index 100%
rename from Tests/Fixtures/Resources/views/menus/overrideTemplate.html.twig
rename to Resources/test/Fixtures/Resources/views/menus/overrideTemplate.html.twig
diff --git a/composer.json b/composer.json
index 9586a0afa..fbeab3497 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,9 @@
     "autoload": {
         "psr-4": { "Chill\\MainBundle\\": "" }
     },
+    "autoload-dev": {
+        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
+    },
     "authors" : [
         {
             "name": "Champs-Libres",
@@ -57,7 +60,8 @@
         ]
     },
     "extra": {
-        "app-migrations-dir": "Tests/Fixtures/App/DoctrineMigrations",
+        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
         "symfony-app-dir": "Tests/Fixtures/App/"
-    }
+    },
+    "prefer-stable": true
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 360d89ccd..4375057ed 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./Resources/test/Fixtures/App/app/autoload.php" colors="true">
     <testsuites>
         <testsuite name="ChillMain test suite">
             <directory suffix="Test.php">./Tests</directory>
@@ -17,7 +17,7 @@
         </whitelist>
     </filter>
     <php>
-        <server name="KERNEL_DIR" value="./Tests/Fixtures/App/" />
+        <server name="KERNEL_DIR" value="./Resources/test/Fixtures/App/app" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
     </php>
 </phpunit>