diff --git a/src/Framework/DataProvidedTestSuite.php b/src/Framework/DataProvidedTestSuite.php
new file mode 100644
index 00000000000..c229e3a5d0e
--- /dev/null
+++ b/src/Framework/DataProvidedTestSuite.php
@@ -0,0 +1,114 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Framework;
+
+use Generator;
+use ReflectionClass;
+use Throwable;
+
+abstract class DataProvidedTestSuite extends TestSuite
+{
+    /**
+     * @var ReflectionClass
+     */
+    protected $theClass;
+    protected $method;
+    public function __construct(ReflectionClass $theClass, string $method)
+    {
+        parent::__construct($theClass, $theClass->getName().'::'.$method, true);
+        $this->theClass = $theClass;
+        $this->method = $method;
+    }
+    /**
+     * @var string[]
+     */
+    private $dependencies = [];
+
+    /**
+     * @param string[] $dependencies
+     */
+    public function setDependencies(array $dependencies): void
+    {
+        $this->dependencies = $dependencies;
+
+        foreach ($this->tests as $test) {
+            $test->setDependencies($dependencies);
+        }
+    }
+
+    public function getDependencies(): array
+    {
+        return $this->dependencies;
+    }
+
+    public function hasDependencies(): bool
+    {
+        return \count($this->dependencies) > 0;
+    }
+
+    abstract protected function yieldData(): iterable;
+
+    /**
+     * @return Generator|Test[]
+     */
+    protected function yieldTests(): Generator
+    {
+        yield from parent::yieldTests();
+        try {
+            foreach ($this->yieldData() as $name => $set) {
+                if(!is_array($set)) {
+                    yield self::incompleteTest(
+                        $this->name,
+                        $this->method,
+                        "{$this->name} set $name is invalid."
+                    );
+                    continue;
+                }
+
+                try {
+                    $test = $this->theClass->newInstanceArgs([
+                        $this->method,
+                        $set,
+                        $name
+                    ]);
+                    $test->setDependencies($this->dependencies);
+                    yield $test;
+                } catch (Throwable $e) {
+                    yield new TestFailureTest(
+                        $this->name,
+                        $this->method,
+                        "Test creation failed for {$this->name} with set $name"
+                    );
+                }
+            }
+        } catch (RiskyTestError $exception) {
+            return new RiskyTestError($exception->getMessage(), 0, $exception);
+        } catch(IncompleteTestError $exception) {
+            return self::incompleteTest(
+                $this->theClass->getName(),
+                $this->method,
+                $exception->getMessage()
+            );
+        } catch (SkippedTestError $e) {
+            return new SkippedTestCase(
+                $this->name,
+                $this->method,
+                "Test for {$this->name} skipped by data provider."
+            );
+        } catch (Throwable $e) {
+            return self::warning("The data provider specified for {$this->name} is invalid.");
+        }
+    }
+
+    public function count($preferCache = false): int
+    {
+        return 1;
+    }
+}
\ No newline at end of file
diff --git a/src/Framework/DataProviderTestSuite.php b/src/Framework/DataProviderTestSuite.php
index af119d27fc1..73ef965bef3 100644
--- a/src/Framework/DataProviderTestSuite.php
+++ b/src/Framework/DataProviderTestSuite.php
@@ -9,32 +9,28 @@
  */
 namespace PHPUnit\Framework;
 
-class DataProviderTestSuite extends TestSuite
-{
-    /**
-     * @var string[]
-     */
-    private $dependencies = [];
-
-    /**
-     * @param string[] $dependencies
-     */
-    public function setDependencies(array $dependencies): void
-    {
-        $this->dependencies = $dependencies;
-
-        foreach ($this->tests as $test) {
-            $test->setDependencies($dependencies);
-        }
-    }
+use ReflectionClass;
 
-    public function getDependencies(): array
+class DataProviderTestSuite extends DataProvidedTestSuite
+{
+    private $provider;
+    public function __construct($provider, ReflectionClass $theClass, string $method)
     {
-        return $this->dependencies;
+        parent::__construct($theClass, $method);
+        $this->provider = $provider;
     }
 
-    public function hasDependencies(): bool
+    protected function yieldData(): iterable
     {
-        return \count($this->dependencies) > 0;
+        if (!$this->theClass->hasMethod($this->provider)) {
+            throw new Exception();
+        }
+        if (!$this->theClass->getMethod($this->provider)->isPublic()) {
+            throw new Exception();
+        }
+        if ($this->theClass->getMethod($this->provider)->isAbstract()) {
+            throw new Exception();
+        }
+        yield from $this->theClass->newInstanceArgs()->{$this->provider}();
     }
 }
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
index 8dbdc6ef7c6..ad83d6920d9 100644
--- a/src/Framework/TestCase.php
+++ b/src/Framework/TestCase.php
@@ -1098,20 +1098,18 @@ public function registerComparator(Comparator $comparator): void
 
     public function getDataSetAsString(bool $includeData = true): string
     {
+        if (empty($this->data)) {
+            return '';
+        }
         $buffer = '';
+        if (\is_int($this->dataName)) {
+            $buffer .= \sprintf(' with data set #%d', $this->dataName);
+        } else {
+            $buffer .= \sprintf(' with data set "%s"', $this->dataName);
+        }
 
-        if (!empty($this->data)) {
-            if (\is_int($this->dataName)) {
-                $buffer .= \sprintf(' with data set #%d', $this->dataName);
-            } else {
-                $buffer .= \sprintf(' with data set "%s"', $this->dataName);
-            }
-
-            $exporter = new Exporter;
-
-            if ($includeData) {
-                $buffer .= \sprintf(' (%s)', $exporter->shortenedRecursiveExport($this->data));
-            }
+        if ($includeData) {
+            $buffer .= \sprintf(' (%s)', (new Exporter)->shortenedRecursiveExport($this->data));
         }
 
         return $buffer;
diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
index 59d129c8d13..cfacb021f02 100644
--- a/src/Framework/TestSuite.php
+++ b/src/Framework/TestSuite.php
@@ -144,128 +144,20 @@ public static function createTest(ReflectionClass $theClass, $name): Test
         if ($constructor === null) {
             throw new Exception('No valid test provided.');
         }
-        $parameters = $constructor->getParameters();
-
-        // TestCase() or TestCase($name)
-        if (\count($parameters) < 2) {
-            $test = new $className;
-        } // TestCase($name, $data)
-        else {
-            try {
-                $data = \PHPUnit\Util\Test::getProvidedData(
-                    $className,
-                    $name
-                );
-            } catch (IncompleteTestError $e) {
-                $message = \sprintf(
-                    'Test for %s::%s marked incomplete by data provider',
-                    $className,
-                    $name
-                );
-
-                $_message = $e->getMessage();
-
-                if (!empty($_message)) {
-                    $message .= "\n" . $_message;
-                }
-
-                $data = self::incompleteTest($className, $name, $message);
-            } catch (SkippedTestError $e) {
-                $message = \sprintf(
-                    'Test for %s::%s skipped by data provider',
-                    $className,
-                    $name
-                );
-
-                $_message = $e->getMessage();
-
-                if (!empty($_message)) {
-                    $message .= "\n" . $_message;
-                }
-
-                $data = self::skipTest($className, $name, $message);
-            } catch (Throwable $t) {
-                $message = \sprintf(
-                    'The data provider specified for %s::%s is invalid.',
-                    $className,
-                    $name
-                );
-
-                $_message = $t->getMessage();
-
-                if (!empty($_message)) {
-                    $message .= "\n" . $_message;
-                }
-
-                $data = self::warning($message);
-            }
-
-            // Test method with @dataProvider.
-            if (isset($data)) {
-                $test = new DataProviderTestSuite(
-                    $className . '::' . $name
-                );
-
-                if (empty($data)) {
-                    $data = self::warning(
-                        \sprintf(
-                            'No tests found in suite "%s".',
-                            $test->getName()
-                        )
-                    );
-                }
-
-                $groups = \PHPUnit\Util\Test::getGroups($className, $name);
-
-                if ($data instanceof WarningTestCase ||
-                    $data instanceof SkippedTestCase ||
-                    $data instanceof IncompleteTestCase) {
-                    $test->addTest($data, $groups);
-                } else {
-                    foreach ($data as $_dataName => $_data) {
-                        $_test = new $className($name, $_data, $_dataName);
-
-                        /* @var TestCase $_test */
-
-                        if ($runTestInSeparateProcess) {
-                            $_test->setRunTestInSeparateProcess(true);
-
-                            if ($preserveGlobalState !== null) {
-                                $_test->setPreserveGlobalState($preserveGlobalState);
-                            }
-                        }
-
-                        if ($runClassInSeparateProcess) {
-                            $_test->setRunClassInSeparateProcess(true);
-
-                            if ($preserveGlobalState !== null) {
-                                $_test->setPreserveGlobalState($preserveGlobalState);
-                            }
-                        }
-
-                        if ($backupSettings['backupGlobals'] !== null) {
-                            $_test->setBackupGlobals(
-                                $backupSettings['backupGlobals']
-                            );
-                        }
-
-                        if ($backupSettings['backupStaticAttributes'] !== null) {
-                            $_test->setBackupStaticAttributes(
-                                $backupSettings['backupStaticAttributes']
-                            );
-                        }
-
-                        $test->addTest($_test, $groups);
-                    }
-                }
-            } else {
-                $test = new $className;
-            }
-        }
-
-        if ($test instanceof TestCase) {
-            $test->setName($name);
-
+        $hasData = false;
+        // TestCase($name, $data)
+        if ($provider = @\PHPUnit\Util\Test::parseTestMethodAnnotations($className, $name)['method']['dataProvider'][0]) {
+            $test = new DataProviderTestSuite($provider, $theClass, $name);
+            $test->setGroupDetails(\PHPUnit\Util\Test::getGroups($className, $name));
+            $hasData = true;
+        }
+        if (null!== @\PHPUnit\Util\Test::parseTestMethodAnnotations($className, $name)['method']['testWith']) {
+            $test = new WithTestSuite($theClass, $name);
+            $test->setGroupDetails(\PHPUnit\Util\Test::getGroups($className, $name));
+            $hasData = true;
+        }
+        if (!$hasData) {
+            $test = new $className($name);
             if ($runTestInSeparateProcess) {
                 $test->setRunTestInSeparateProcess(true);
 
@@ -328,7 +220,7 @@ public static function isTestMethod(ReflectionMethod $method): bool
      *
      * @throws Exception
      */
-    public function __construct($theClass = '', $name = '')
+    public function __construct($theClass = '', $name = '', bool $skipTestDiscovery = false)
     {
         $this->declaredClasses = \get_declared_classes();
 
@@ -384,7 +276,9 @@ public function __construct($theClass = '', $name = '')
 
             return;
         }
-
+        if ($skipTestDiscovery) {
+            return;
+        }
         foreach ($theClass->getMethods() as $method) {
             if ($method->getDeclaringClass()->getName() === Assert::class) {
                 continue;
@@ -670,6 +564,14 @@ public function setGroupDetails(array $groups): void
         $this->groups = $groups;
     }
 
+    /**
+     * @return \Generator|Test[]
+     */
+    protected function yieldTests(): \Generator
+    {
+        yield from $this->tests;
+    }
+
     /**
      * Runs the tests and collects their result in a TestResult.
      *
@@ -735,7 +637,7 @@ public function run(TestResult $result = null): TestResult
             return $result;
         }
 
-        foreach ($this as $test) {
+        foreach ($this->yieldTests() as $test) {
             if ($result->shouldStop()) {
                 break;
             }
@@ -789,10 +691,12 @@ public function testAt(int $index)
 
     /**
      * Returns the tests as an enumeration.
+     * @deprecated
+     * @todo see how this is used, since it removes the benefits of yielding
      */
     public function tests(): array
     {
-        return $this->tests;
+        return iterator_to_array($this->yieldTests());
     }
 
     /**
@@ -892,11 +796,11 @@ protected function addTestMethod(ReflectionClass $class, ReflectionMethod $metho
         if (!$method->isPublic()) {
             $this->addTest(
                 self::warning(
-                    \sprintf(
-                        'Test method "%s" in test class "%s" is not public.',
-                        $name,
-                        $class->getName()
-                    )
+                \sprintf(
+                    'Test method "%s" in test class "%s" is not public.',
+                    $name,
+                    $class->getName()
+                )
                 )
             );
 
diff --git a/src/Framework/WithTestSuite.php b/src/Framework/WithTestSuite.php
new file mode 100644
index 00000000000..3e5f1a2ef11
--- /dev/null
+++ b/src/Framework/WithTestSuite.php
@@ -0,0 +1,20 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Framework;
+
+class WithTestSuite extends DataProvidedTestSuite
+{
+    protected function yieldData(): iterable
+    {
+        return \PHPUnit\Util\Test::getDataFromTestWithAnnotation(
+            $this->theClass->getMethod($this->method)->getDocComment()
+        )??[];
+    }
+}
diff --git a/src/TextUI/ResultPrinter.php b/src/TextUI/ResultPrinter.php
index e8b5c30708a..2ccab3760cf 100644
--- a/src/TextUI/ResultPrinter.php
+++ b/src/TextUI/ResultPrinter.php
@@ -255,8 +255,8 @@ public function startTestSuite(TestSuite $suite): void
     {
         if ($this->numTests == -1) {
             $this->numTests      = \count($suite);
-            $this->numTestsWidth = \strlen((string) $this->numTests);
-            $this->maxColumn     = $this->numberOfColumns - \strlen('  /  (XXX%)') - (2 * $this->numTestsWidth);
+            $this->numTestsWidth = \strlen((string) $this->numTests) + 3;
+            $this->maxColumn     = $this->numberOfColumns - 1 - $this->numTestsWidth;
         }
     }
 
@@ -496,18 +496,12 @@ protected function writeProgress(string $progress): void
         $this->column++;
         $this->numTestsRun++;
 
-        if ($this->column == $this->maxColumn || $this->numTestsRun == $this->numTests) {
-            if ($this->numTestsRun == $this->numTests) {
-                $this->write(\str_repeat(' ', $this->maxColumn - $this->column));
-            }
+        if ($this->column == $this->maxColumn) {
 
             $this->write(
                 \sprintf(
-                    ' %' . $this->numTestsWidth . 'd / %' .
-                    $this->numTestsWidth . 'd (%3s%%)',
-                    $this->numTestsRun,
-                    $this->numTests,
-                    \floor(($this->numTestsRun / $this->numTests) * 100)
+                    ' %' . $this->numTestsWidth . 'd',
+                    $this->numTestsRun
                 )
             );
 
diff --git a/tests/Regression/GitHub/1149.phpt b/tests/Regression/GitHub/1149.phpt
index bd4b60a5d21..6de8fa626c6 100644
--- a/tests/Regression/GitHub/1149.phpt
+++ b/tests/Regression/GitHub/1149.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.1.                                                                  2 / 2 (100%)2
+.1.2
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/1265.phpt b/tests/Regression/GitHub/1265.phpt
index ed66d8094cb..69448d54397 100644
--- a/tests/Regression/GitHub/1265.phpt
+++ b/tests/Regression/GitHub/1265.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/1335.phpt b/tests/Regression/GitHub/1335.phpt
index afb94f9bf42..453586d96bf 100644
--- a/tests/Regression/GitHub/1335.phpt
+++ b/tests/Regression/GitHub/1335.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-............                                                      12 / 12 (100%)
+............
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/1337.phpt b/tests/Regression/GitHub/1337.phpt
index c9b1512ee89..404f2f60feb 100644
--- a/tests/Regression/GitHub/1337.phpt
+++ b/tests/Regression/GitHub/1337.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/1348.phpt b/tests/Regression/GitHub/1348.phpt
index f49d9da7271..ab33fe251ae 100644
--- a/tests/Regression/GitHub/1348.phpt
+++ b/tests/Regression/GitHub/1348.phpt
@@ -20,7 +20,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 .
 STDOUT does not break test result
-E                                                                  2 / 2 (100%)
+E
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/1351.phpt b/tests/Regression/GitHub/1351.phpt
index 71dd26b3ab8..45e585d823a 100644
--- a/tests/Regression/GitHub/1351.phpt
+++ b/tests/Regression/GitHub/1351.phpt
@@ -18,7 +18,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-F.E.E                                                               5 / 5 (100%)
+F.E.E
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/1374.phpt b/tests/Regression/GitHub/1374.phpt
index 3f7c80e51eb..86cf12acc2c 100644
--- a/tests/Regression/GitHub/1374.phpt
+++ b/tests/Regression/GitHub/1374.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-S                                                                   1 / 1 (100%)
+S
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/1437.phpt b/tests/Regression/GitHub/1437.phpt
index de7077ef275..b467b4bd2b3 100644
--- a/tests/Regression/GitHub/1437.phpt
+++ b/tests/Regression/GitHub/1437.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-F                                                                   1 / 1 (100%)
+F
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/1468.phpt b/tests/Regression/GitHub/1468.phpt
index 73c9d73bdf9..766a4de3eb2 100644
--- a/tests/Regression/GitHub/1468.phpt
+++ b/tests/Regression/GitHub/1468.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-I                                                                   1 / 1 (100%)
+I
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/1471.phpt b/tests/Regression/GitHub/1471.phpt
index ee3d6752281..c880a5b40b7 100644
--- a/tests/Regression/GitHub/1471.phpt
+++ b/tests/Regression/GitHub/1471.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-F                                                                   1 / 1 (100%)
+F
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/1472.phpt b/tests/Regression/GitHub/1472.phpt
index a255176f115..3cd6e0719f2 100644
--- a/tests/Regression/GitHub/1472.phpt
+++ b/tests/Regression/GitHub/1472.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/1570.phpt b/tests/Regression/GitHub/1570.phpt
index 7e30de5d9ed..db5a68d276f 100644
--- a/tests/Regression/GitHub/1570.phpt
+++ b/tests/Regression/GitHub/1570.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-R                                                                   1 / 1 (100%)*
+R*
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2137-filter.phpt b/tests/Regression/GitHub/2137-filter.phpt
index 7ca926523d3..19bb43d9e51 100644
--- a/tests/Regression/GitHub/2137-filter.phpt
+++ b/tests/Regression/GitHub/2137-filter.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-W                                                                   1 / 1 (100%)
+W
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2137-no_filter.phpt b/tests/Regression/GitHub/2137-no_filter.phpt
index d068472ff49..754c41bff4b 100644
--- a/tests/Regression/GitHub/2137-no_filter.phpt
+++ b/tests/Regression/GitHub/2137-no_filter.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-WW                                                                  2 / 2 (100%)
+WW
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2158.phpt b/tests/Regression/GitHub/2158.phpt
index 9ce0b4b5f32..395e1538baa 100644
--- a/tests/Regression/GitHub/2158.phpt
+++ b/tests/Regression/GitHub/2158.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2366.phpt b/tests/Regression/GitHub/2366.phpt
index c75e212b336..0f62d100ac9 100644
--- a/tests/Regression/GitHub/2366.phpt
+++ b/tests/Regression/GitHub/2366.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2380.phpt b/tests/Regression/GitHub/2380.phpt
index 4defaeebf26..e03fb50a4a1 100644
--- a/tests/Regression/GitHub/2380.phpt
+++ b/tests/Regression/GitHub/2380.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2382.phpt b/tests/Regression/GitHub/2382.phpt
index 969b25e0a3f..1f9033fa537 100644
--- a/tests/Regression/GitHub/2382.phpt
+++ b/tests/Regression/GitHub/2382.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2435.phpt b/tests/Regression/GitHub/2435.phpt
index f4cabef4a63..e99616ec8c7 100644
--- a/tests/Regression/GitHub/2435.phpt
+++ b/tests/Regression/GitHub/2435.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/244.phpt b/tests/Regression/GitHub/244.phpt
index 6624e64159f..966d53715f8 100644
--- a/tests/Regression/GitHub/244.phpt
+++ b/tests/Regression/GitHub/244.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.FFF                                                                4 / 4 (100%)
+.FFF
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2448-existing-test.phpt b/tests/Regression/GitHub/2448-existing-test.phpt
index 5706a96f3c1..8cf81cee080 100644
--- a/tests/Regression/GitHub/2448-existing-test.phpt
+++ b/tests/Regression/GitHub/2448-existing-test.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main(false);
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt b/tests/Regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
index 4d0dbdfe6cc..19554f96aa3 100644
--- a/tests/Regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
+++ b/tests/Regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-E.E                                                                 3 / 3 (100%)
+E.E
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2591-separate-class-preserve.phpt b/tests/Regression/GitHub/2591-separate-class-preserve.phpt
index 9594b7f01c9..c42e848514c 100644
--- a/tests/Regression/GitHub/2591-separate-class-preserve.phpt
+++ b/tests/Regression/GitHub/2591-separate-class-preserve.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-php73.phpt b/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-php73.phpt
index 2b5e4f9f0ac..336cb8dfd92 100644
--- a/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-php73.phpt
+++ b/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-php73.phpt
@@ -21,7 +21,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-EE                                                                  2 / 2 (100%)
+EE
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt b/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
index 21e65dd07c9..e009be42fb4 100644
--- a/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
+++ b/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
@@ -19,7 +19,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-EE                                                                  2 / 2 (100%)
+EE
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt b/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
index b82f22466a0..73c651449b6 100644
--- a/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
+++ b/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
@@ -21,7 +21,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-EE                                                                  2 / 2 (100%)
+EE
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2591-separate-function-no-preserve.phpt b/tests/Regression/GitHub/2591-separate-function-no-preserve.phpt
index 44aee685233..a73dd274ae7 100644
--- a/tests/Regression/GitHub/2591-separate-function-no-preserve.phpt
+++ b/tests/Regression/GitHub/2591-separate-function-no-preserve.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2591-separate-function-preserve.phpt b/tests/Regression/GitHub/2591-separate-function-preserve.phpt
index 8bc9c504633..db1d15756ab 100644
--- a/tests/Regression/GitHub/2591-separate-function-preserve.phpt
+++ b/tests/Regression/GitHub/2591-separate-function-preserve.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2724-diff-pid-from-master-process.phpt b/tests/Regression/GitHub/2724-diff-pid-from-master-process.phpt
index e05078659dc..29ff6d90dc5 100644
--- a/tests/Regression/GitHub/2724-diff-pid-from-master-process.phpt
+++ b/tests/Regression/GitHub/2724-diff-pid-from-master-process.phpt
@@ -15,7 +15,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2725-separate-class-before-after-pid.phpt b/tests/Regression/GitHub/2725-separate-class-before-after-pid.phpt
index 0985903d4a6..7bfa92af930 100644
--- a/tests/Regression/GitHub/2725-separate-class-before-after-pid.phpt
+++ b/tests/Regression/GitHub/2725-separate-class-before-after-pid.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2731.phpt b/tests/Regression/GitHub/2731.phpt
index 681d3c28d8b..d0c36848c3b 100644
--- a/tests/Regression/GitHub/2731.phpt
+++ b/tests/Regression/GitHub/2731.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-F                                                                   1 / 1 (100%)
+F
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2811.phpt b/tests/Regression/GitHub/2811.phpt
index 7d442dc212c..2bc19b3ad5a 100644
--- a/tests/Regression/GitHub/2811.phpt
+++ b/tests/Regression/GitHub/2811.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2830.phpt b/tests/Regression/GitHub/2830.phpt
index f46079dae4a..523d00cacbd 100644
--- a/tests/Regression/GitHub/2830.phpt
+++ b/tests/Regression/GitHub/2830.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/2972.phpt b/tests/Regression/GitHub/2972.phpt
index db9e56963dc..158a7ec63f3 100644
--- a/tests/Regression/GitHub/2972.phpt
+++ b/tests/Regression/GitHub/2972.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/3093/issue-3093-test.phpt b/tests/Regression/GitHub/3093/issue-3093-test.phpt
index ffac64da598..7f15c5e61ae 100644
--- a/tests/Regression/GitHub/3093/issue-3093-test.phpt
+++ b/tests/Regression/GitHub/3093/issue-3093-test.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/433.phpt b/tests/Regression/GitHub/433.phpt
index f64a29a1833..a796d2ee9e3 100644
--- a/tests/Regression/GitHub/433.phpt
+++ b/tests/Regression/GitHub/433.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..F                                                                 3 / 3 (100%)
+..F
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/445.phpt b/tests/Regression/GitHub/445.phpt
index a49768c60f4..2f267e06a09 100644
--- a/tests/Regression/GitHub/445.phpt
+++ b/tests/Regression/GitHub/445.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..F                                                                 3 / 3 (100%)
+..F
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/498.phpt b/tests/Regression/GitHub/498.phpt
index e231889b2fc..4c5347354a5 100644
--- a/tests/Regression/GitHub/498.phpt
+++ b/tests/Regression/GitHub/498.phpt
@@ -15,7 +15,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-W                                                                   1 / 1 (100%)
+W
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/503.phpt b/tests/Regression/GitHub/503.phpt
index 2c8d992dcec..5e2d2480051 100644
--- a/tests/Regression/GitHub/503.phpt
+++ b/tests/Regression/GitHub/503.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-F                                                                   1 / 1 (100%)
+F
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/581.phpt b/tests/Regression/GitHub/581.phpt
index 861f325ce91..6f0f9786ec9 100644
--- a/tests/Regression/GitHub/581.phpt
+++ b/tests/Regression/GitHub/581.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-F                                                                   1 / 1 (100%)
+F
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/74.phpt b/tests/Regression/GitHub/74.phpt
index 4f7fa2936f3..ac5fde05ce3 100644
--- a/tests/Regression/GitHub/74.phpt
+++ b/tests/Regression/GitHub/74.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-E                                                                   1 / 1 (100%)
+E
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/765.phpt b/tests/Regression/GitHub/765.phpt
index 507eff91fab..917c65dee91 100644
--- a/tests/Regression/GitHub/765.phpt
+++ b/tests/Regression/GitHub/765.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.W                                                                  2 / 2 (100%)
+.W
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/797.phpt b/tests/Regression/GitHub/797.phpt
index cff94bdd5ba..bedccee1c09 100644
--- a/tests/Regression/GitHub/797.phpt
+++ b/tests/Regression/GitHub/797.phpt
@@ -15,7 +15,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/GitHub/863.phpt b/tests/Regression/GitHub/863.phpt
index df1c62719bc..b541a94a4ab 100644
--- a/tests/Regression/GitHub/863.phpt
+++ b/tests/Regression/GitHub/863.phpt
@@ -15,9 +15,9 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...............................................................  63 / 150 ( 42%)
-............................................................... 126 / 150 ( 84%)
-........................                                        150 / 150 (100%)
+.........................................................................     73
+.........................................................................    146
+....
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/Trac/1021.phpt b/tests/Regression/Trac/1021.phpt
index be084675f46..969b57fcf08 100644
--- a/tests/Regression/Trac/1021.phpt
+++ b/tests/Regression/Trac/1021.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/Trac/523.phpt b/tests/Regression/Trac/523.phpt
index 6ee85b622b5..e2e050fa261 100644
--- a/tests/Regression/Trac/523.phpt
+++ b/tests/Regression/Trac/523.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/Trac/578.phpt b/tests/Regression/Trac/578.phpt
index 111e3a011b0..92a0d48690e 100644
--- a/tests/Regression/Trac/578.phpt
+++ b/tests/Regression/Trac/578.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-EEE                                                                 3 / 3 (100%)
+EEE
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/Trac/684.phpt b/tests/Regression/Trac/684.phpt
index 33eda07c037..f0489ad3173 100644
--- a/tests/Regression/Trac/684.phpt
+++ b/tests/Regression/Trac/684.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-W                                                                   1 / 1 (100%)
+W
 
 Time: %s, Memory: %s
 
diff --git a/tests/Regression/Trac/783.phpt b/tests/Regression/Trac/783.phpt
index b902d36dc89..6b3a4b510e9 100644
--- a/tests/Regression/Trac/783.phpt
+++ b/tests/Regression/Trac/783.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/abstract-test-class.phpt b/tests/TextUI/abstract-test-class.phpt
index 41535e64b71..771bedc0bec 100644
--- a/tests/TextUI/abstract-test-class.phpt
+++ b/tests/TextUI/abstract-test-class.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-W                                                                   1 / 1 (100%)
+W
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/assertion.phpt b/tests/TextUI/assertion.phpt
index f9306fb8cd6..446063de25c 100644
--- a/tests/TextUI/assertion.phpt
+++ b/tests/TextUI/assertion.phpt
@@ -25,7 +25,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-F                                                                   1 / 1 (100%)
+F
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/cache-result.phpt b/tests/TextUI/cache-result.phpt
index 55320c82b0b..7bb06456ff8 100644
--- a/tests/TextUI/cache-result.phpt
+++ b/tests/TextUI/cache-result.phpt
@@ -20,7 +20,7 @@ unlink($target);
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.SS..                                                               5 / 5 (100%)
+.SS..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/code-coverage-ignore.phpt b/tests/TextUI/code-coverage-ignore.phpt
index f6ca35a5312..59a50b84e6a 100644
--- a/tests/TextUI/code-coverage-ignore.phpt
+++ b/tests/TextUI/code-coverage-ignore.phpt
@@ -20,7 +20,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/code-coverage-phpt.phpt b/tests/TextUI/code-coverage-phpt.phpt
index c32817b7be5..57df99ee776 100644
--- a/tests/TextUI/code-coverage-phpt.phpt
+++ b/tests/TextUI/code-coverage-phpt.phpt
@@ -22,7 +22,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/colors-always.phpt b/tests/TextUI/colors-always.phpt
index 792824d76ee..eee5872c486 100644
--- a/tests/TextUI/colors-always.phpt
+++ b/tests/TextUI/colors-always.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/concrete-test-class.phpt b/tests/TextUI/concrete-test-class.phpt
index ffbb6abf6e1..90fc45d1a45 100644
--- a/tests/TextUI/concrete-test-class.phpt
+++ b/tests/TextUI/concrete-test-class.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/custom-printer-verbose.phpt b/tests/TextUI/custom-printer-verbose.phpt
index 06ed19d8786..3616ae6d825 100644
--- a/tests/TextUI/custom-printer-verbose.phpt
+++ b/tests/TextUI/custom-printer-verbose.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 Runtime:       %s
 Configuration: %sconfiguration.custom-printer.xml
 
-I                                                                   1 / 1 (100%)
+I
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/dataprovider-issue-2833.phpt b/tests/TextUI/dataprovider-issue-2833.phpt
index e1d55b1aa8c..86f8d4afbf6 100644
--- a/tests/TextUI/dataprovider-issue-2833.phpt
+++ b/tests/TextUI/dataprovider-issue-2833.phpt
@@ -10,7 +10,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/dataprovider-issue-2859.phpt b/tests/TextUI/dataprovider-issue-2859.phpt
index c6e8ed66cc7..79880afbe5d 100644
--- a/tests/TextUI/dataprovider-issue-2859.phpt
+++ b/tests/TextUI/dataprovider-issue-2859.phpt
@@ -10,7 +10,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/dataprovider-issue-2922.phpt b/tests/TextUI/dataprovider-issue-2922.phpt
index 2a864fbf6fd..5674d151a26 100644
--- a/tests/TextUI/dataprovider-issue-2922.phpt
+++ b/tests/TextUI/dataprovider-issue-2922.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/dataprovider-log-xml-isolation.phpt b/tests/TextUI/dataprovider-log-xml-isolation.phpt
index a1a49769ab0..4cb1ff549c6 100644
--- a/tests/TextUI/dataprovider-log-xml-isolation.phpt
+++ b/tests/TextUI/dataprovider-log-xml-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..F.                                                                4 / 4 (100%)<?xml version="1.0" encoding="UTF-8"?>
+..F.<?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
   <testsuite name="DataProviderTest" file="%sDataProviderTest.php" tests="4" assertions="4" errors="0" failures="1" skipped="0" time="%f">
     <testsuite name="DataProviderTest::testAdd" tests="4" assertions="4" errors="0" failures="1" skipped="0" time="%f">
diff --git a/tests/TextUI/dataprovider-log-xml.phpt b/tests/TextUI/dataprovider-log-xml.phpt
index 642236002c9..875a25d7412 100644
--- a/tests/TextUI/dataprovider-log-xml.phpt
+++ b/tests/TextUI/dataprovider-log-xml.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..F.                                                                4 / 4 (100%)<?xml version="1.0" encoding="UTF-8"?>
+..F.<?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
   <testsuite name="DataProviderTest" file="%sDataProviderTest.php" tests="4" assertions="4" errors="0" failures="1" skipped="0" time="%f">
     <testsuite name="DataProviderTest::testAdd" tests="4" assertions="4" errors="0" failures="1" skipped="0" time="%f">
diff --git a/tests/TextUI/default-isolation.phpt b/tests/TextUI/default-isolation.phpt
index 49084f49ea0..f86cea8d3c8 100644
--- a/tests/TextUI/default-isolation.phpt
+++ b/tests/TextUI/default-isolation.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/default.phpt b/tests/TextUI/default.phpt
index cf4c9d348d5..cea266c0056 100644
--- a/tests/TextUI/default.phpt
+++ b/tests/TextUI/default.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/dependencies-clone.phpt b/tests/TextUI/dependencies-clone.phpt
index ed3e862e2ee..0f6470e5dde 100644
--- a/tests/TextUI/dependencies-clone.phpt
+++ b/tests/TextUI/dependencies-clone.phpt
@@ -14,7 +14,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 Runtime:       %s
 
-......                                                              6 / 6 (100%)
+......
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/dependencies-isolation.phpt b/tests/TextUI/dependencies-isolation.phpt
index 331204e68cc..365b588426b 100644
--- a/tests/TextUI/dependencies-isolation.phpt
+++ b/tests/TextUI/dependencies-isolation.phpt
@@ -15,7 +15,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 Runtime:       %s
 
-...FSSS                                                             7 / 7 (100%)
+...FSSS
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/dependencies.phpt b/tests/TextUI/dependencies.phpt
index f495cd76a57..63399ba1b41 100644
--- a/tests/TextUI/dependencies.phpt
+++ b/tests/TextUI/dependencies.phpt
@@ -14,7 +14,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 Runtime:       %s
 
-...FSSS                                                             7 / 7 (100%)
+...FSSS
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/dependencies2-isolation.phpt b/tests/TextUI/dependencies2-isolation.phpt
index 87af237926e..b3d015fa85d 100644
--- a/tests/TextUI/dependencies2-isolation.phpt
+++ b/tests/TextUI/dependencies2-isolation.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/dependencies2.phpt b/tests/TextUI/dependencies2.phpt
index 92dd403fa63..caf91e75a93 100644
--- a/tests/TextUI/dependencies2.phpt
+++ b/tests/TextUI/dependencies2.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/dependencies3-isolation.phpt b/tests/TextUI/dependencies3-isolation.phpt
index c6656d7325f..4b82e5d84d2 100644
--- a/tests/TextUI/dependencies3-isolation.phpt
+++ b/tests/TextUI/dependencies3-isolation.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.....                                                               5 / 5 (100%)
+.....
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/dependencies3.phpt b/tests/TextUI/dependencies3.phpt
index 210815d56e0..f847485c372 100644
--- a/tests/TextUI/dependencies3.phpt
+++ b/tests/TextUI/dependencies3.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.....                                                               5 / 5 (100%)
+.....
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/disable-code-coverage-ignore.phpt b/tests/TextUI/disable-code-coverage-ignore.phpt
index 391a0453734..ba956aade55 100644
--- a/tests/TextUI/disable-code-coverage-ignore.phpt
+++ b/tests/TextUI/disable-code-coverage-ignore.phpt
@@ -21,7 +21,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/empty-testcase.phpt b/tests/TextUI/empty-testcase.phpt
index afc100802f2..b52f0d25136 100644
--- a/tests/TextUI/empty-testcase.phpt
+++ b/tests/TextUI/empty-testcase.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-W                                                                   1 / 1 (100%)
+W
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/exception-stack.phpt b/tests/TextUI/exception-stack.phpt
index ccedd5a5563..12de8916c43 100644
--- a/tests/TextUI/exception-stack.phpt
+++ b/tests/TextUI/exception-stack.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-EE                                                                  2 / 2 (100%)
+EE
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/exclude-group-isolation.phpt b/tests/TextUI/exclude-group-isolation.phpt
index 0f8bb8080f7..51355669a27 100644
--- a/tests/TextUI/exclude-group-isolation.phpt
+++ b/tests/TextUI/exclude-group-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/exclude-group.phpt b/tests/TextUI/exclude-group.phpt
index 90667489aad..47ee2902d78 100644
--- a/tests/TextUI/exclude-group.phpt
+++ b/tests/TextUI/exclude-group.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/failure-isolation.phpt b/tests/TextUI/failure-isolation.phpt
index c319f60f5d7..4c5e63efda4 100644
--- a/tests/TextUI/failure-isolation.phpt
+++ b/tests/TextUI/failure-isolation.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-FFFFFFFFFFFFF                                                     13 / 13 (100%)
+FFFFFFFFFFFFF
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/failure-reverse-list.phpt b/tests/TextUI/failure-reverse-list.phpt
index b16b23540b2..530503fcf22 100644
--- a/tests/TextUI/failure-reverse-list.phpt
+++ b/tests/TextUI/failure-reverse-list.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-FFFFFFFFFFFFF                                                     13 / 13 (100%)
+FFFFFFFFFFFFF
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/failure.phpt b/tests/TextUI/failure.phpt
index 217af841e5f..650aae6c8e7 100644
--- a/tests/TextUI/failure.phpt
+++ b/tests/TextUI/failure.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-FFFFFFFFFFFFF                                                     13 / 13 (100%)
+FFFFFFFFFFFFF
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/fatal-isolation.phpt b/tests/TextUI/fatal-isolation.phpt
index bfa7340879e..06193dffddd 100644
--- a/tests/TextUI/fatal-isolation.phpt
+++ b/tests/TextUI/fatal-isolation.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-E                                                                   1 / 1 (100%)
+E
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-class-isolation.phpt b/tests/TextUI/filter-class-isolation.phpt
index 1bc2ba3b0fd..10cbb80878d 100644
--- a/tests/TextUI/filter-class-isolation.phpt
+++ b/tests/TextUI/filter-class-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-class.phpt b/tests/TextUI/filter-class.phpt
index 5477c0b798a..4477344aa11 100644
--- a/tests/TextUI/filter-class.phpt
+++ b/tests/TextUI/filter-class.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt b/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
index 27fe0098c33..79238a86c1e 100644
--- a/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
+++ b/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt b/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
index 8984681f3c8..bf2349c5a08 100644
--- a/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
+++ b/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-number-isolation.phpt b/tests/TextUI/filter-dataprovider-by-number-isolation.phpt
index 6f141e65781..761b594dcc1 100644
--- a/tests/TextUI/filter-dataprovider-by-number-isolation.phpt
+++ b/tests/TextUI/filter-dataprovider-by-number-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-number.phpt b/tests/TextUI/filter-dataprovider-by-number.phpt
index 90a1fb65280..f6e4a8affe5 100644
--- a/tests/TextUI/filter-dataprovider-by-number.phpt
+++ b/tests/TextUI/filter-dataprovider-by-number.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt b/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
index bb007c084f7..9cecc6c07a8 100644
--- a/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
+++ b/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-only-range.phpt b/tests/TextUI/filter-dataprovider-by-only-range.phpt
index fa677f0e8f3..9408fa5fe31 100644
--- a/tests/TextUI/filter-dataprovider-by-only-range.phpt
+++ b/tests/TextUI/filter-dataprovider-by-only-range.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt b/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
index 04c10e42c3e..e8658e93587 100644
--- a/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
+++ b/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-only-regexp.phpt b/tests/TextUI/filter-dataprovider-by-only-regexp.phpt
index 0fea03b7be9..9f3b1428931 100644
--- a/tests/TextUI/filter-dataprovider-by-only-regexp.phpt
+++ b/tests/TextUI/filter-dataprovider-by-only-regexp.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt b/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
index 95c344c179e..bef75ccefc8 100644
--- a/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
+++ b/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-only-string.phpt b/tests/TextUI/filter-dataprovider-by-only-string.phpt
index 2dac9ecdd99..cfc52221dad 100644
--- a/tests/TextUI/filter-dataprovider-by-only-string.phpt
+++ b/tests/TextUI/filter-dataprovider-by-only-string.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-range-isolation.phpt b/tests/TextUI/filter-dataprovider-by-range-isolation.phpt
index 90335cafc1c..d7ff9904494 100644
--- a/tests/TextUI/filter-dataprovider-by-range-isolation.phpt
+++ b/tests/TextUI/filter-dataprovider-by-range-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-range.phpt b/tests/TextUI/filter-dataprovider-by-range.phpt
index b028a669636..767c3566971 100644
--- a/tests/TextUI/filter-dataprovider-by-range.phpt
+++ b/tests/TextUI/filter-dataprovider-by-range.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt b/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
index 18b933c07b2..c85ca9e2edf 100644
--- a/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
+++ b/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-regexp.phpt b/tests/TextUI/filter-dataprovider-by-regexp.phpt
index 006a4600459..75e0c121c13 100644
--- a/tests/TextUI/filter-dataprovider-by-regexp.phpt
+++ b/tests/TextUI/filter-dataprovider-by-regexp.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+..
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-string-isolation.phpt b/tests/TextUI/filter-dataprovider-by-string-isolation.phpt
index e88a17db679..0da1773d02b 100644
--- a/tests/TextUI/filter-dataprovider-by-string-isolation.phpt
+++ b/tests/TextUI/filter-dataprovider-by-string-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-dataprovider-by-string.phpt b/tests/TextUI/filter-dataprovider-by-string.phpt
index 6dc88ddb625..b69b29ef064 100644
--- a/tests/TextUI/filter-dataprovider-by-string.phpt
+++ b/tests/TextUI/filter-dataprovider-by-string.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-method-case-insensitive.phpt b/tests/TextUI/filter-method-case-insensitive.phpt
index a2151f7c7a1..c11af677e33 100644
--- a/tests/TextUI/filter-method-case-insensitive.phpt
+++ b/tests/TextUI/filter-method-case-insensitive.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-method-isolation.phpt b/tests/TextUI/filter-method-isolation.phpt
index 542dff443ab..f9e962d95f0 100644
--- a/tests/TextUI/filter-method-isolation.phpt
+++ b/tests/TextUI/filter-method-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/filter-method.phpt b/tests/TextUI/filter-method.phpt
index d63101e905e..a7eb87fbc29 100644
--- a/tests/TextUI/filter-method.phpt
+++ b/tests/TextUI/filter-method.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/forward-compatibility.phpt b/tests/TextUI/forward-compatibility.phpt
index cf4c9d348d5..cea266c0056 100644
--- a/tests/TextUI/forward-compatibility.phpt
+++ b/tests/TextUI/forward-compatibility.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/group-isolation.phpt b/tests/TextUI/group-isolation.phpt
index c0ca940bb6b..126b40bc9f0 100644
--- a/tests/TextUI/group-isolation.phpt
+++ b/tests/TextUI/group-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/group.phpt b/tests/TextUI/group.phpt
index a7f862f2879..6ec7644aea9 100644
--- a/tests/TextUI/group.phpt
+++ b/tests/TextUI/group.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/ini-isolation.phpt b/tests/TextUI/ini-isolation.phpt
index 284ecb20401..891cc2adccc 100644
--- a/tests/TextUI/ini-isolation.phpt
+++ b/tests/TextUI/ini-isolation.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/log-junit.phpt b/tests/TextUI/log-junit.phpt
index c37191ed684..b1bced2d1d9 100644
--- a/tests/TextUI/log-junit.phpt
+++ b/tests/TextUI/log-junit.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.FEISRW                                                             7 / 7 (100%)<?xml version="1.0" encoding="UTF-8"?>
+.FEISRW <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
   <testsuite name="vendor\project\StatusTest" file="%s%eStatusTest.php" tests="7" assertions="2" errors="2" failures="2" skipped="2" time="%s">
     <testcase name="testSuccess" class="vendor\project\StatusTest" classname="vendor.project.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="1" time="%s"/>
diff --git a/tests/TextUI/log-teamcity.phpt b/tests/TextUI/log-teamcity.phpt
index db919a8843e..9534397d4d7 100644
--- a/tests/TextUI/log-teamcity.phpt
+++ b/tests/TextUI/log-teamcity.phpt
@@ -27,7 +27,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 ##teamcity[testFinished name='testBalanceCannotBecomeNegative' duration='%s' flowId='%d']
 
 ##teamcity[testStarted name='testBalanceCannotBecomeNegative2' locationHint='php_qn://%s%etests%e_files%eBankAccountTest.php::\BankAccountTest::testBalanceCannotBecomeNegative2' flowId='%d']
-.                                                                 3 / 3 (100%)
+.                                                                 3 
 ##teamcity[testFinished name='testBalanceCannotBecomeNegative2' duration='%s' flowId='%d']
 
 ##teamcity[testSuiteFinished name='BankAccountTest' flowId='%d']
diff --git a/tests/TextUI/mycommand.phpt b/tests/TextUI/mycommand.phpt
index fc63788a3f7..61c5a4c8df3 100644
--- a/tests/TextUI/mycommand.phpt
+++ b/tests/TextUI/mycommand.phpt
@@ -17,7 +17,7 @@ MyCommand::main();
 MyCommand::myHandler 123
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/options-after-arguments.phpt b/tests/TextUI/options-after-arguments.phpt
index dabd8e42ed0..11f9c39fee0 100644
--- a/tests/TextUI/options-after-arguments.phpt
+++ b/tests/TextUI/options-after-arguments.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/output-isolation.phpt b/tests/TextUI/output-isolation.phpt
index 15a87db05b2..e81af64634e 100644
--- a/tests/TextUI/output-isolation.phpt
+++ b/tests/TextUI/output-isolation.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/phar-extension.phpt b/tests/TextUI/phar-extension.phpt
index b222c823522..8cdc87d3357 100644
--- a/tests/TextUI/phar-extension.phpt
+++ b/tests/TextUI/phar-extension.phpt
@@ -14,7 +14,7 @@ Runtime:       %s
 Configuration: %s%ephpunit-example-extension%ephpunit.xml
 Extension:     phpunit/phpunit-example-extension 3.0.3
 
-.                                                                   1 / 1 (100%)
+.
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/phpt-xfail.phpt b/tests/TextUI/phpt-xfail.phpt
index 6b3e49f52bc..cd6aeb1c839 100644
--- a/tests/TextUI/phpt-xfail.phpt
+++ b/tests/TextUI/phpt-xfail.phpt
@@ -10,7 +10,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-I                                                                   1 / 1 (100%)
+I
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/repeat.phpt b/tests/TextUI/repeat.phpt
index ae7eb3f5ae3..14f9c00e315 100644
--- a/tests/TextUI/repeat.phpt
+++ b/tests/TextUI/repeat.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.........                                                           9 / 9 (100%)
+.........
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/report-tests-performing-assertions-when-annotated-with-does-not-perform-assertions.phpt b/tests/TextUI/report-tests-performing-assertions-when-annotated-with-does-not-perform-assertions.phpt
index 1cafbde68d4..6b200d64248 100644
--- a/tests/TextUI/report-tests-performing-assertions-when-annotated-with-does-not-perform-assertions.phpt
+++ b/tests/TextUI/report-tests-performing-assertions-when-annotated-with-does-not-perform-assertions.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-R                                                                   1 / 1 (100%)
+R
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/report-useless-tests-incomplete.phpt b/tests/TextUI/report-useless-tests-incomplete.phpt
index e00af36e123..7e33a0ef891 100644
--- a/tests/TextUI/report-useless-tests-incomplete.phpt
+++ b/tests/TextUI/report-useless-tests-incomplete.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-I                                                                   1 / 1 (100%)
+I
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/report-useless-tests-isolation.phpt b/tests/TextUI/report-useless-tests-isolation.phpt
index 34d7195017e..c47dd6188fe 100644
--- a/tests/TextUI/report-useless-tests-isolation.phpt
+++ b/tests/TextUI/report-useless-tests-isolation.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-R                                                                   1 / 1 (100%)
+R
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/report-useless-tests.phpt b/tests/TextUI/report-useless-tests.phpt
index a5c81d2fcef..4eb6664d940 100644
--- a/tests/TextUI/report-useless-tests.phpt
+++ b/tests/TextUI/report-useless-tests.phpt
@@ -11,7 +11,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-R                                                                   1 / 1 (100%)
+R
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/test-order-randomized-with-dependency-resolution.phpt b/tests/TextUI/test-order-randomized-with-dependency-resolution.phpt
index c3c02920f5b..60719b081ec 100644
--- a/tests/TextUI/test-order-randomized-with-dependency-resolution.phpt
+++ b/tests/TextUI/test-order-randomized-with-dependency-resolution.phpt
@@ -18,7 +18,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 Runtime:       %s
 Random seed:   %d
 
-.....                                                               5 / 5 (100%)
+.....
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/test-suffix-multiple.phpt b/tests/TextUI/test-suffix-multiple.phpt
index e5184196830..494cee565ac 100644
--- a/tests/TextUI/test-suffix-multiple.phpt
+++ b/tests/TextUI/test-suffix-multiple.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.....                                                               5 / 5 (100%)
+.....
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/test-suffix-single.phpt b/tests/TextUI/test-suffix-single.phpt
index dad2c4dade3..16d49bd4e8c 100644
--- a/tests/TextUI/test-suffix-single.phpt
+++ b/tests/TextUI/test-suffix-single.phpt
@@ -12,7 +12,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
+...
 
 Time: %s, Memory: %s
 
diff --git a/tests/TextUI/testdox-exclude-group.phpt b/tests/TextUI/testdox-exclude-group.phpt
index af82dfa7934..3ff2d484c09 100644
--- a/tests/TextUI/testdox-exclude-group.phpt
+++ b/tests/TextUI/testdox-exclude-group.phpt
@@ -16,7 +16,7 @@ PHPUnit\TextUI\Command::main();
 PHPUnit %s by Sebastian Bergmann and contributors.
 
 .DoxGroup
-.                                                                  2 / 2 (100%) [x] Two
+. [x] Two
 
 
 
diff --git a/tests/TextUI/testdox-group.phpt b/tests/TextUI/testdox-group.phpt
index 3f74d573b24..5e1be0ad47f 100644
--- a/tests/TextUI/testdox-group.phpt
+++ b/tests/TextUI/testdox-group.phpt
@@ -16,7 +16,7 @@ PHPUnit\TextUI\Command::main();
 PHPUnit %s by Sebastian Bergmann and contributors.
 
 DoxGroup
-..                                                                  2 / 2 (100%) [x] One
+.. [x] One
 
 
 
diff --git a/tests/TextUI/testdox-html.phpt b/tests/TextUI/testdox-html.phpt
index 8453712118b..961c16e5bca 100644
--- a/tests/TextUI/testdox-html.phpt
+++ b/tests/TextUI/testdox-html.phpt
@@ -45,7 +45,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
         <h2 id="BankAccountTest">BankAccount</h2>
         <ul>
-...                                                                 3 / 3 (100%)            <li style="color: #555753;">✓ Balance is initially zero</li>
+...            <li style="color: #555753;">✓ Balance is initially zero</li>
             <li style="color: #555753;">✓ Balance cannot become negative</li>
             <li style="color: #555753;">✓ Balance cannot become negative</li>
         </ul>
diff --git a/tests/TextUI/testdox-text.phpt b/tests/TextUI/testdox-text.phpt
index f6bda8d1daf..a20763dad27 100644
--- a/tests/TextUI/testdox-text.phpt
+++ b/tests/TextUI/testdox-text.phpt
@@ -14,7 +14,7 @@ PHPUnit\TextUI\Command::main();
 PHPUnit %s by Sebastian Bergmann and contributors.
 
 BankAccount
-...                                                                 3 / 3 (100%) [x] Balance is initially zero
+... [x] Balance is initially zero
  [x] Balance cannot become negative
  [x] Balance cannot become negative
 
diff --git a/tests/TextUI/testdox-xml.phpt b/tests/TextUI/testdox-xml.phpt
index dcb2c7e56da..dab8369e5a3 100644
--- a/tests/TextUI/testdox-xml.phpt
+++ b/tests/TextUI/testdox-xml.phpt
@@ -13,7 +13,7 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.FEISRW                                                             7 / 7 (100%)<?xml version="1.0" encoding="UTF-8"?>
+.FEISRW<?xml version="1.0" encoding="UTF-8"?>
 <tests>
   <test className="vendor\project\StatusTest" methodName="testSuccess" prettifiedClassName="vendor\project\Status" prettifiedMethodName="Success" status="0" time="%s" size="-1" groups="default"/>
   <test className="vendor\project\StatusTest" methodName="testFailure" prettifiedClassName="vendor\project\Status" prettifiedMethodName="Failure" status="3" time="%s" size="-1" groups="default" exceptionLine="%d" exceptionMessage="Failed asserting that false is true."/>