diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
deleted file mode 100644
index 239bd9d..0000000
--- a/app/phpunit.xml.dist
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <!--
-            <server name="KERNEL_DIR" value="/path/to/your/app/" />
-        -->
-    </php>
-
-    <testsuites>
-        <testsuite name="Project Test Suite">
-            <directory>../src/*/*Bundle/Tests</directory>
-            <directory>../src/*/Bundle/*Bundle/Tests</directory>
-            <directory>../src/*Bundle/Tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>../src</directory>
-            <exclude>
-                <directory>../src/*Bundle/Resources</directory>
-                <directory>../src/*Bundle/Tests</directory>
-                <directory>../src/*/*Bundle/Resources</directory>
-                <directory>../src/*/*Bundle/Tests</directory>
-                <directory>../src/*/Bundle/*Bundle/Resources</directory>
-                <directory>../src/*/Bundle/*Bundle/Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 5e070ef..0afce1a 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": ">=7.0.0",
         "symfony/symfony": "3.2.*",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..c6063bb
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="app/autoload.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+        <server name="KERNEL_DIR" value="app/" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Project Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>src</directory>
+            <exclude>
+                <directory>src/*Bundle/Resources</directory>
+                <directory>src/*/*Bundle/Resources</directory>
+                <directory>src/*/Bundle/*Bundle/Resources</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
\ No newline at end of file
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/EventsControllerTest.php b/tests/Skobkin/PointToolsBundle/Controller/EventsControllerTest.php
similarity index 92%
rename from src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/EventsControllerTest.php
rename to tests/Skobkin/PointToolsBundle/Controller/EventsControllerTest.php
index 71910eb..2dc8e32 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/EventsControllerTest.php
+++ b/tests/Skobkin/PointToolsBundle/Controller/EventsControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Tests\Controller;
+namespace Tests\Skobkin\PointToolsBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/MainControllerTest.php b/tests/Skobkin/PointToolsBundle/Controller/MainControllerTest.php
similarity index 98%
rename from src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/MainControllerTest.php
rename to tests/Skobkin/PointToolsBundle/Controller/MainControllerTest.php
index 5c75c88..ea76661 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/MainControllerTest.php
+++ b/tests/Skobkin/PointToolsBundle/Controller/MainControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Tests\Controller;
+namespace Tests\Skobkin\PointToolsBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/PostControllerTest.php b/tests/Skobkin/PointToolsBundle/Controller/PostControllerTest.php
similarity index 96%
rename from src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/PostControllerTest.php
rename to tests/Skobkin/PointToolsBundle/Controller/PostControllerTest.php
index 38ba547..d2d6a0b 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/PostControllerTest.php
+++ b/tests/Skobkin/PointToolsBundle/Controller/PostControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Tests\Controller;
+namespace Tests\Skobkin\PointToolsBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\DomCrawler\Crawler;
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/UserControllerTest.php b/tests/Skobkin/PointToolsBundle/Controller/UserControllerTest.php
similarity index 97%
rename from src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/UserControllerTest.php
rename to tests/Skobkin/PointToolsBundle/Controller/UserControllerTest.php
index 17dd200..52e9be5 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Tests/Controller/UserControllerTest.php
+++ b/tests/Skobkin/PointToolsBundle/Controller/UserControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Tests\Controller;
+namespace Tests\Skobkin\PointToolsBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\DomCrawler\Crawler;