diff --git a/tests/php-unit-tests/unitary-tests/application/SCSSCompilationTest.php b/tests/php-unit-tests/unitary-tests/application/SCSSCompilationTest.php
index bb47ef516..027a49307 100644
--- a/tests/php-unit-tests/unitary-tests/application/SCSSCompilationTest.php
+++ b/tests/php-unit-tests/unitary-tests/application/SCSSCompilationTest.php
@@ -4,7 +4,10 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+namespace Combodo\iTop\Test\UnitTest\Application;
+
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use utils;
 
 class SCSSCompilationTest extends ItopTestCase
 {
diff --git a/tests/php-unit-tests/unitary-tests/application/Session/SessionTest.php b/tests/php-unit-tests/unitary-tests/application/Session/SessionTest.php
index fbc598da6..8d8e31682 100644
--- a/tests/php-unit-tests/unitary-tests/application/Session/SessionTest.php
+++ b/tests/php-unit-tests/unitary-tests/application/Session/SessionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Combodo\iTop\Test\UnitTest\Application;
+
 use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
 
diff --git a/tests/php-unit-tests/unitary-tests/application/ThemeHandlerTest.php b/tests/php-unit-tests/unitary-tests/application/ThemeHandlerTest.php
index 15a530f3d..e48d43bc5 100644
--- a/tests/php-unit-tests/unitary-tests/application/ThemeHandlerTest.php
+++ b/tests/php-unit-tests/unitary-tests/application/ThemeHandlerTest.php
@@ -1,6 +1,10 @@
 <?php
 
+namespace Combodo\iTop\Test\UnitTest\Application;
+
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use FindStylesheetObject;
+use ThemeHandler;
 
 /**
  * @runTestsInSeparateProcesses
diff --git a/tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php b/tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
index 19378eb4b..2bb1bd54e 100644
--- a/tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
@@ -5,7 +5,13 @@
  * Time: 14:43
  */
 
+namespace Combodo\iTop\Test\UnitTest\Core;
+
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use Config;
+use iTopConfigParser;
+use RunTimeEnvironment;
+use utils;
 
 class iTopConfigParserTest extends ItopTestCase
 {
diff --git a/tests/php-unit-tests/unitary-tests/setup/MFCompilerTest.php b/tests/php-unit-tests/unitary-tests/setup/MFCompilerTest.php
index f970ae38f..0794677ef 100644
--- a/tests/php-unit-tests/unitary-tests/setup/MFCompilerTest.php
+++ b/tests/php-unit-tests/unitary-tests/setup/MFCompilerTest.php
@@ -1,6 +1,12 @@
 <?php
 
+namespace Combodo\iTop\Test\UnitTest\Setup;
+
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use MFCompiler;
+use MFDocument;
+use SubMFCompiler;
+use utils;
 
 /**
  * @runTestsInSeparateProcesses
diff --git a/tests/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php b/tests/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
index 64554f4d8..1648f518e 100644
--- a/tests/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
+++ b/tests/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Combodo\iTop\Test\UnitTest\Composer;
+
 use Combodo\iTop\Composer\iTopComposer;
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
 
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php b/tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php
index f9cffcf84..6200310c6 100644
--- a/tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php
+++ b/tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php
@@ -4,6 +4,7 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+namespace Combodo\iTop\Test\UnitTest\Application\Helper;
 
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/RuntimeDashboardTest.php b/tests/php-unit-tests/unitary-tests/sources/application/RuntimeDashboardTest.php
index b8dc86b8d..c08bda3ac 100644
--- a/tests/php-unit-tests/unitary-tests/sources/application/RuntimeDashboardTest.php
+++ b/tests/php-unit-tests/unitary-tests/sources/application/RuntimeDashboardTest.php
@@ -4,7 +4,11 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+namespace Combodo\iTop\Test\UnitTest\Application;
+
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use RuntimeDashboard;
+use SecurityException;
 
 
 /**
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/TestAutoload.php b/tests/php-unit-tests/unitary-tests/sources/application/TestAutoload.php
index 60a57f45d..ef5fedcbf 100644
--- a/tests/php-unit-tests/unitary-tests/sources/application/TestAutoload.php
+++ b/tests/php-unit-tests/unitary-tests/sources/application/TestAutoload.php
@@ -4,6 +4,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+namespace Combodo\iTop\Test\UnitTest\Application;
+
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 
 /**
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php b/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php
index c01ad8606..1fd373d95 100644
--- a/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php
+++ b/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php
@@ -1,5 +1,6 @@
 <?php
-namespace Combodo\iTop\Test\UnitTest;
+
+namespace Combodo\iTop\Test\UnitTest\Application\TwigBase;
 
 use Combodo\iTop\Portal\Twig\AppExtension;
 use Twig_Environment;