diff --git a/test/setup/ModelFactoryTest.php b/tests/php-unit-tests/unitary-tests/setup/ModelFactoryTest.php
similarity index 99%
rename from test/setup/ModelFactoryTest.php
rename to tests/php-unit-tests/unitary-tests/setup/ModelFactoryTest.php
index 46c7aef2c..94e56cf67 100644
--- a/test/setup/ModelFactoryTest.php
+++ b/tests/php-unit-tests/unitary-tests/setup/ModelFactoryTest.php
@@ -36,7 +36,7 @@ class ModelFactoryTest extends ItopTestCase
 	{
 		parent::setUp();
 
-		require_once(APPROOT.'setup/modelfactory.class.inc.php');
+		$this->RequireOnceItopFile('setup/modelfactory.class.inc.php');
 	}
 
 	/**
diff --git a/test/application/RuntimeDashboardTest.php b/tests/php-unit-tests/unitary-tests/sources/application/RuntimeDashboardTest.php
similarity index 100%
rename from test/application/RuntimeDashboardTest.php
rename to tests/php-unit-tests/unitary-tests/sources/application/RuntimeDashboardTest.php
diff --git a/test/application/TestAutoload.php b/tests/php-unit-tests/unitary-tests/sources/application/TestAutoload.php
similarity index 100%
rename from test/application/TestAutoload.php
rename to tests/php-unit-tests/unitary-tests/sources/application/TestAutoload.php
diff --git a/test/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/attacker/backdoor b/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/attacker/backdoor
similarity index 100%
rename from test/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/attacker/backdoor
rename to tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/attacker/backdoor