diff --git a/tests/php-unit-tests/phpunit.xml.dist b/tests/php-unit-tests/phpunit.xml.dist
index 832aef8c7..5ff602568 100644
--- a/tests/php-unit-tests/phpunit.xml.dist
+++ b/tests/php-unit-tests/phpunit.xml.dist
@@ -43,10 +43,10 @@
     </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>
+      <directory>unitary-tests/sources/Application/Search</directory>
     </testsuite>
     <testsuite name="SourceApplicationStatus">
-      <directory>unitary-tests/sources/application/status</directory>
+      <directory>unitary-tests/sources/Application/Status</directory>
     </testsuite>
     <testsuite name="SourcesComposer">
       <directory>unitary-tests/sources/Composer</directory>
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
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php
rename to tests/php-unit-tests/unitary-tests/sources/Application/Helper/WebResourcesHelperTest.php
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/RuntimeDashboardTest.php b/tests/php-unit-tests/unitary-tests/sources/Application/RuntimeDashboardTest.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/RuntimeDashboardTest.php
rename to tests/php-unit-tests/unitary-tests/sources/Application/RuntimeDashboardTest.php
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/search/CriterionConversionTest.php b/tests/php-unit-tests/unitary-tests/sources/Application/Search/CriterionConversionTest.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/search/CriterionConversionTest.php
rename to tests/php-unit-tests/unitary-tests/sources/Application/Search/CriterionConversionTest.php
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/search/CriterionParserTest.php b/tests/php-unit-tests/unitary-tests/sources/Application/Search/CriterionParserTest.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/search/CriterionParserTest.php
rename to tests/php-unit-tests/unitary-tests/sources/Application/Search/CriterionParserTest.php
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/search/SearchFormTest.php b/tests/php-unit-tests/unitary-tests/sources/Application/Search/SearchFormTest.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/search/SearchFormTest.php
rename to tests/php-unit-tests/unitary-tests/sources/Application/Search/SearchFormTest.php
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/Service/EventTest.php b/tests/php-unit-tests/unitary-tests/sources/Application/Service/EventTest.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/Service/EventTest.php
rename to tests/php-unit-tests/unitary-tests/sources/Application/Service/EventTest.php
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php b/tests/php-unit-tests/unitary-tests/sources/Application/Status/StatusIncTest.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php
rename to tests/php-unit-tests/unitary-tests/sources/Application/Status/StatusIncTest.php
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/status/StatusTest.php b/tests/php-unit-tests/unitary-tests/sources/Application/Status/StatusTest.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/status/StatusTest.php
rename to tests/php-unit-tests/unitary-tests/sources/Application/Status/StatusTest.php
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/status/status.php b/tests/php-unit-tests/unitary-tests/sources/Application/Status/status.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/status/status.php
rename to tests/php-unit-tests/unitary-tests/sources/Application/Status/status.php
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/TestAutoload.php b/tests/php-unit-tests/unitary-tests/sources/Application/TestAutoload.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/TestAutoload.php
rename to tests/php-unit-tests/unitary-tests/sources/Application/TestAutoload.php
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
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php
rename to tests/php-unit-tests/unitary-tests/sources/Application/TwigBase/Twig/TwigTest.php
diff --git a/tests/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 tests/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
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html b/tests/php-unit-tests/unitary-tests/sources/Application/TwigBase/Twig/test.html
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html
rename to tests/php-unit-tests/unitary-tests/sources/Application/TwigBase/Twig/test.html
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html.twig b/tests/php-unit-tests/unitary-tests/sources/Application/TwigBase/Twig/test.html.twig
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html.twig
rename to tests/php-unit-tests/unitary-tests/sources/Application/TwigBase/Twig/test.html.twig