diff --git a/.gitignore b/.gitignore
index 628803c9..26ad278c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-Tests/Functional/App/cache
-Tests/Functional/App/logs
+Tests/Resources/app/cache
+Tests/Resources/app/logs
 composer.lock
 vendor
diff --git a/Tests/Functional/App/config/config.php b/Tests/Functional/App/config/config.php
deleted file mode 100644
index cbef2632..00000000
--- a/Tests/Functional/App/config/config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$loader->import(CMF_TEST_CONFIG_DIR.'/sonata_admin.php');
-$loader->import(__DIR__.'/cmf_menu.yml');
diff --git a/Tests/Functional/App/AppKernel.php b/Tests/Resources/app/AppKernel.php
similarity index 100%
rename from Tests/Functional/App/AppKernel.php
rename to Tests/Resources/app/AppKernel.php
diff --git a/Tests/Functional/App/config/cmf_menu.yml b/Tests/Resources/app/config/cmf_menu.yml
similarity index 100%
rename from Tests/Functional/App/config/cmf_menu.yml
rename to Tests/Resources/app/config/cmf_menu.yml
diff --git a/Tests/Resources/app/config/config.php b/Tests/Resources/app/config/config.php
new file mode 100644
index 00000000..7e0c1fc2
--- /dev/null
+++ b/Tests/Resources/app/config/config.php
@@ -0,0 +1,6 @@
+<?php
+
+$loader->import(CMF_TEST_CONFIG_DIR.'/default.php');
+$loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');
+$loader->import(CMF_TEST_CONFIG_DIR.'/sonata_admin.php');
+$loader->import(__DIR__.'/cmf_menu.yml');
diff --git a/Tests/Functional/App/config/routing.php b/Tests/Resources/app/config/routing.php
similarity index 100%
rename from Tests/Functional/App/config/routing.php
rename to Tests/Resources/app/config/routing.php
diff --git a/Tests/ContentAwareFactoryTest.php b/Tests/Unit/ContentAwareFactoryTest.php
similarity index 100%
rename from Tests/ContentAwareFactoryTest.php
rename to Tests/Unit/ContentAwareFactoryTest.php
diff --git a/Tests/Document/MenuNodeTest.php b/Tests/Unit/Document/MenuNodeTest.php
similarity index 100%
rename from Tests/Document/MenuNodeTest.php
rename to Tests/Unit/Document/MenuNodeTest.php
diff --git a/Tests/Document/MultilangMenuNodeTest.php b/Tests/Unit/Document/MultilangMenuNodeTest.php
similarity index 100%
rename from Tests/Document/MultilangMenuNodeTest.php
rename to Tests/Unit/Document/MultilangMenuNodeTest.php
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b4fa3341..2429e90e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -26,7 +26,7 @@
     </filter>
 
     <php>
-        <server name="KERNEL_DIR" value="Tests/Functional/App" />
+        <server name="KERNEL_DIR" value="Tests/Resources/app" />
     </php>
 
 </phpunit>