diff --git a/src/Symfony/Contracts/Tests/Service/ServiceLocatorTest.php b/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php
similarity index 98%
rename from src/Symfony/Contracts/Tests/Service/ServiceLocatorTest.php
rename to src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php
index 22487a8992..69594583f5 100644
--- a/src/Symfony/Contracts/Tests/Service/ServiceLocatorTest.php
+++ b/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Contracts\Tests\Service;
+namespace Symfony\Contracts\Service\Test;
 
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
diff --git a/src/Symfony/Contracts/Tests/Translation/TranslatorTest.php b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php
similarity index 99%
rename from src/Symfony/Contracts/Tests/Translation/TranslatorTest.php
rename to src/Symfony/Contracts/Translation/Test/TranslatorTest.php
index ac5f9c7aeb..48466300b5 100644
--- a/src/Symfony/Contracts/Tests/Translation/TranslatorTest.php
+++ b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Contracts\Tests\Translation;
+namespace Symfony\Contracts\Translation\Test;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Contracts\Translation\TranslatorInterface;
diff --git a/src/Symfony/Contracts/phpunit.xml.dist b/src/Symfony/Contracts/phpunit.xml.dist
index e222d9f5a7..fd93d020f2 100644
--- a/src/Symfony/Contracts/phpunit.xml.dist
+++ b/src/Symfony/Contracts/phpunit.xml.dist
@@ -15,6 +15,8 @@
     <testsuites>
         <testsuite name="Symfony Contracts Test Suite">
             <directory>./Tests/</directory>
+            <directory>./Service/Test/</directory>
+            <directory>./Translation/Test/</directory>
         </testsuite>
     </testsuites>
 
@@ -23,6 +25,8 @@
             <directory>./</directory>
             <exclude>
                 <directory>./Tests</directory>
+                <directory>./Service/Test/</directory>
+                <directory>./Translation/Test/</directory>
                 <directory>./vendor</directory>
             </exclude>
         </whitelist>