diff --git a/composer.json b/composer.json
index dd00226d6..67ee9d071 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,9 @@
         "psr-4": { "": "src/" },
         "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
     },
+    "autoload-dev": {
+        "psr-4": { "Tests\\": "tests/" }
+    },
     "require": {
         "php"                                  : ">=5.5.9",
         "ext-pdo_sqlite"                       : "*",
diff --git a/composer.lock b/composer.lock
index b9a5577e7..6b445dbe6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "44a25675a4555856202aff994d036594",
+    "hash": "7d34f7109d60963d41797d33cf4e133f",
     "content-hash": "705e36e3576ba45d2d2aa678c320f082",
     "packages": [
         {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e0afaf7b9..65e90821d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,7 +14,7 @@
 
     <testsuites>
         <testsuite name="Project Test Suite">
-            <directory>src/*Bundle/Tests</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
diff --git a/src/AppBundle/Tests/Controller/Admin/BlogControllerTest.php b/tests/AppBundle/Controller/Admin/BlogControllerTest.php
similarity index 97%
rename from src/AppBundle/Tests/Controller/Admin/BlogControllerTest.php
rename to tests/AppBundle/Controller/Admin/BlogControllerTest.php
index b8fcb3e8c..a66dc698f 100644
--- a/src/AppBundle/Tests/Controller/Admin/BlogControllerTest.php
+++ b/tests/AppBundle/Controller/Admin/BlogControllerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace AppBundle\Tests\Controller\Admin;
+namespace Tests\AppBundle\Controller\Admin;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/src/AppBundle/Tests/Controller/BlogControllerTest.php b/tests/AppBundle/Controller/BlogControllerTest.php
similarity index 96%
rename from src/AppBundle/Tests/Controller/BlogControllerTest.php
rename to tests/AppBundle/Controller/BlogControllerTest.php
index 43c5aa76b..793a1694b 100644
--- a/src/AppBundle/Tests/Controller/BlogControllerTest.php
+++ b/tests/AppBundle/Controller/BlogControllerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace AppBundle\Tests\Controller;
+namespace Tests\AppBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use AppBundle\Entity\Post;
diff --git a/src/AppBundle/Tests/Controller/DefaultControllerTest.php b/tests/AppBundle/Controller/DefaultControllerTest.php
similarity index 98%
rename from src/AppBundle/Tests/Controller/DefaultControllerTest.php
rename to tests/AppBundle/Controller/DefaultControllerTest.php
index 621388821..36a17535a 100644
--- a/src/AppBundle/Tests/Controller/DefaultControllerTest.php
+++ b/tests/AppBundle/Controller/DefaultControllerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace AppBundle\Tests\Controller;
+namespace Tests\AppBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
diff --git a/src/AppBundle/Tests/Utils/SluggerTest.php b/tests/AppBundle/Utils/SluggerTest.php
similarity index 97%
rename from src/AppBundle/Tests/Utils/SluggerTest.php
rename to tests/AppBundle/Utils/SluggerTest.php
index 43828ad71..fc9abd0a2 100644
--- a/src/AppBundle/Tests/Utils/SluggerTest.php
+++ b/tests/AppBundle/Utils/SluggerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Utils;
+namespace Tests\AppBundle\Utils;
 
 use AppBundle\Utils\Slugger;