diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php
index d8e74e8192..5b864bfe58 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php
@@ -29,7 +29,7 @@ class SymfonyTestsListenerForV6 extends BaseTestListener
 
     public function __construct(array $mockedNamespaces = array())
     {
-        $this->trait = new Legacy\SymfonyTestsListenerTrait($mockedNamespaces);
+        $this->trait = new SymfonyTestsListenerTrait($mockedNamespaces);
     }
 
     public function globalListenerDisabled()
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunner.php b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunner.php
index 4bbf2f1cb9..8a57416bd2 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunner.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunner.php
@@ -23,7 +23,7 @@ class TestRunner extends \PHPUnit_TextUI_TestRunner
      */
     protected function handleConfiguration(array &$arguments)
     {
-        $listener = new SymfonyTestsListener();
+        $listener = new SymfonyTestsListenerForV5();
 
         $result = parent::handleConfiguration($arguments);
 
@@ -32,7 +32,7 @@ class TestRunner extends \PHPUnit_TextUI_TestRunner
         $registeredLocally = false;
 
         foreach ($arguments['listeners'] as $registeredListener) {
-            if ($registeredListener instanceof SymfonyTestsListener) {
+            if ($registeredListener instanceof SymfonyTestsListenerForV5) {
                 $registeredListener->globalListenerDisabled();
                 $registeredLocally = true;
                 break;
diff --git a/src/Symfony/Bridge/PhpUnit/TextUI/Command.php b/src/Symfony/Bridge/PhpUnit/TextUI/Command.php
index 408533292a..869a8a8dbe 100644
--- a/src/Symfony/Bridge/PhpUnit/TextUI/Command.php
+++ b/src/Symfony/Bridge/PhpUnit/TextUI/Command.php
@@ -15,22 +15,20 @@ use PHPUnit\TextUI\Command as BaseCommand;
 
 if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
     class_alias('Symfony\Bridge\PhpUnit\Legacy\Command', 'Symfony\Bridge\PhpUnit\TextUI\Command');
-
-    return;
-}
-
-/**
- * {@inheritdoc}
- *
- * @internal
- */
-class Command extends BaseCommand
-{
+} else {
     /**
      * {@inheritdoc}
+     *
+     * @internal
      */
-    protected function createRunner()
+    class Command extends BaseCommand
     {
-        return new TestRunner($this->arguments['loader']);
+        /**
+         * {@inheritdoc}
+         */
+        protected function createRunner()
+        {
+            return new TestRunner($this->arguments['loader']);
+        }
     }
 }
diff --git a/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
index 07fe2d165b..4e1fdca4d5 100644
--- a/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
+++ b/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
@@ -16,42 +16,40 @@ use Symfony\Bridge\PhpUnit\SymfonyTestsListener;
 
 if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
     class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunner', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');
-
-    return;
-}
-
-/**
- * {@inheritdoc}
- *
- * @internal
- */
-class TestRunner extends BaseRunner
-{
+} else {
     /**
      * {@inheritdoc}
+     *
+     * @internal
      */
-    protected function handleConfiguration(array &$arguments)
+    class TestRunner extends BaseRunner
     {
-        $listener = new SymfonyTestsListener();
+        /**
+         * {@inheritdoc}
+         */
+        protected function handleConfiguration(array &$arguments)
+        {
+            $listener = new SymfonyTestsListener();
 
-        $result = parent::handleConfiguration($arguments);
+            $result = parent::handleConfiguration($arguments);
 
-        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
+            $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
 
-        $registeredLocally = false;
+            $registeredLocally = false;
 
-        foreach ($arguments['listeners'] as $registeredListener) {
-            if ($registeredListener instanceof SymfonyTestsListener) {
-                $registeredListener->globalListenerDisabled();
-                $registeredLocally = true;
-                break;
+            foreach ($arguments['listeners'] as $registeredListener) {
+                if ($registeredListener instanceof SymfonyTestsListener) {
+                    $registeredListener->globalListenerDisabled();
+                    $registeredLocally = true;
+                    break;
+                }
             }
-        }
 
-        if (!$registeredLocally) {
-            $arguments['listeners'][] = $listener;
-        }
+            if (!$registeredLocally) {
+                $arguments['listeners'][] = $listener;
+            }
 
-        return $result;
+            return $result;
+        }
     }
 }