diff --git a/.make/composer/rmDeniedTestDir.php b/.make/composer/rmDeniedTestDir.php
index d2e35bcec..1ac2c698a 100644
--- a/.make/composer/rmDeniedTestDir.php
+++ b/.make/composer/rmDeniedTestDir.php
@@ -19,6 +19,8 @@
  *
  */
 
+use Combodo\iTop\Composer\iTopComposer;
+
 $iTopFolder = __DIR__ . "/../../" ;
 
 require_once ("$iTopFolder/approot.inc.php");
diff --git a/composer.json b/composer.json
index 077463a5b..240f68395 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,8 @@
     "classmap": [
       "core",
       "application",
-      "sources/application"
+      "sources/application",
+      "sources/Composer"
     ],
     "exclude-from-classmap": [
       "core/dbobjectsearch.class.php",
diff --git a/sources/application/composer/iTopComposer.php b/sources/Composer/iTopComposer.php
similarity index 89%
rename from sources/application/composer/iTopComposer.php
rename to sources/Composer/iTopComposer.php
index 31d178eec..e3bf2cc54 100644
--- a/sources/application/composer/iTopComposer.php
+++ b/sources/Composer/iTopComposer.php
@@ -19,6 +19,12 @@
  *
  */
 
+namespace  Combodo\iTop\Composer;
+
+use FilesystemIterator;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
 class iTopComposer
 {
 
@@ -27,7 +33,7 @@ class iTopComposer
 		$aAllTestDirs = array();
 		$sPath = realpath(APPROOT.'lib');
 
-		$oDirectoryIterator = new RecursiveDirectoryIterator($sPath);
+		$oDirectoryIterator = new RecursiveDirectoryIterator($sPath,  FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO|FilesystemIterator::SKIP_DOTS|FilesystemIterator::UNIX_PATHS);
 		$iterator = new RecursiveIteratorIterator(
 			$oDirectoryIterator,
 			RecursiveIteratorIterator::CHILD_FIRST);
@@ -38,18 +44,12 @@ class iTopComposer
 				continue;
 			}
 			$sDirName = $file->getFilename();
-			if (in_array($sDirName, array('.', '..'), true))
-			{
-				continue;
-			}
 			if (!$this->IsTestDir($sDirName))
 			{
 				continue;
 			}
 
-			$sDirPath = $file->getRealpath();
-			$sDirPathWithSlashes = str_replace(DIRECTORY_SEPARATOR, '/', $sDirPath);
-			$aAllTestDirs[] = $sDirPathWithSlashes;
+			$aAllTestDirs[] = $file->getRealpath();
 		}
 
 		return $aAllTestDirs;
@@ -114,6 +114,8 @@ class iTopComposer
 			$APPROOT_WITH_SLASHES.'lib/symfony/web-profiler-bundle/Tests',
 			$APPROOT_WITH_SLASHES.'lib/symfony/yaml/Tests',
 			$APPROOT_WITH_SLASHES.'lib/symfony/debug/Resources/ext/tests',
+			$APPROOT_WITH_SLASHES.'lib/goaop/framework/tests',
+			$APPROOT_WITH_SLASHES.'lib/twig/twig/doc/tests',
 		);
 	}
 
diff --git a/test/application/composer/iTopComposerTest.php b/test/application/composer/iTopComposerTest.php
index 3e9e30ead..2d7ef86ee 100644
--- a/test/application/composer/iTopComposerTest.php
+++ b/test/application/composer/iTopComposerTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Combodo\iTop\Composer\iTopComposer;
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
 
 /**
@@ -26,10 +27,11 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
 class iTopComposerTest extends ItopTestCase
 {
 
-//	protected function setUp()
-//	{
-//		parent::setUp();
-//	}
+	protected function setUp()
+	{
+		parent::setUp();
+		clearstatcache();
+	}
 
 	public function testListAllTestDir()
 	{