diff --git a/test/php-unit-tests/phpunit.xml.dist b/test/php-unit-tests/phpunit.xml.dist
index ea11c8160..099fb9406 100644
--- a/test/php-unit-tests/phpunit.xml.dist
+++ b/test/php-unit-tests/phpunit.xml.dist
@@ -50,6 +50,13 @@
     <testsuite name="Setup">
       <directory>unitary-tests/setup</directory>
     </testsuite>
+    <!-- Note: The unitary-tests/sources/application/TwigBase is omitted for now as the test is not working -->
+    <testsuite name="SourcesApplicationSearch">
+      <directory>unitary-tests/sources/application/search</directory>
+    </testsuite>
+    <testsuite name="SourcesComposer">
+      <directory>unitary-tests/sources/Composer</directory>
+    </testsuite>
     <testsuite name="Status">
       <directory>unitary-tests/status</directory>
     </testsuite>
diff --git a/test/php-unit-tests/unitary-tests/application/UtilsTest.php b/test/php-unit-tests/unitary-tests/application/utilsTest.php
similarity index 99%
rename from test/php-unit-tests/unitary-tests/application/UtilsTest.php
rename to test/php-unit-tests/unitary-tests/application/utilsTest.php
index e09b7d25c..354146b7c 100644
--- a/test/php-unit-tests/unitary-tests/application/UtilsTest.php
+++ b/test/php-unit-tests/unitary-tests/application/utilsTest.php
@@ -24,7 +24,7 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
 /**
  * @covers utils
  */
-class UtilsTest extends ItopTestCase
+class utilsTest extends ItopTestCase
 {
 	public function testEndsWith()
 	{
diff --git a/test/php-unit-tests/unitary-tests/application/composer/iTopComposerTest.php b/test/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
similarity index 94%
rename from test/php-unit-tests/unitary-tests/application/composer/iTopComposerTest.php
rename to test/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
index e103360aa..6fe8e08e5 100644
--- a/test/php-unit-tests/unitary-tests/application/composer/iTopComposerTest.php
+++ b/test/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
@@ -22,8 +22,6 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
  *   along with iTop. If not, see <http: *www.gnu.org/licenses/>
  *
  */
-
-
 class iTopComposerTest extends ItopTestCase
 {
 
@@ -84,8 +82,7 @@ class iTopComposerTest extends ItopTestCase
 		$this->assertTrue(is_array($aDirs));
 
 		$aDeniedDirWrongFormat = [];
-		foreach ($aDirs as $sDir)
-		{
+		foreach ($aDirs as $sDir) {
 			if (false === iTopComposer::IsTestDir($sDir)) {
 				$aDeniedDirWrongFormat[] = $sDir;
 			}
@@ -138,8 +135,8 @@ class iTopComposerTest extends ItopTestCase
 		$this->assertEmpty(
 			$aMissing,
 			'Test dirs exists in /lib !'."\n"
-				.'  They must be declared either in the allowed or denied list in '.iTopComposer::class." (see N°2651).\n"
-				.'  List of dirs:'."\n".var_export($aMissing, true)
+			.'  They must be declared either in the allowed or denied list in '.iTopComposer::class." (see N°2651).\n"
+			.'  List of dirs:'."\n".var_export($aMissing, true)
 		);
 	}
 }
diff --git a/test/php-unit-tests/unitary-tests/application/search/CriterionConversionTest.php b/test/php-unit-tests/unitary-tests/sources/application/search/CriterionConversionTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/application/search/CriterionConversionTest.php
rename to test/php-unit-tests/unitary-tests/sources/application/search/CriterionConversionTest.php
diff --git a/test/php-unit-tests/unitary-tests/application/search/CriterionParserTest.php b/test/php-unit-tests/unitary-tests/sources/application/search/CriterionParserTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/application/search/CriterionParserTest.php
rename to test/php-unit-tests/unitary-tests/sources/application/search/CriterionParserTest.php
diff --git a/test/php-unit-tests/unitary-tests/application/search/SearchFormTest.php b/test/php-unit-tests/unitary-tests/sources/application/search/SearchFormTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/application/search/SearchFormTest.php
rename to test/php-unit-tests/unitary-tests/sources/application/search/SearchFormTest.php