diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
index 3476b5bded9..5fb77ddafe9 100644
--- a/.psalm/baseline.xml
+++ b/.psalm/baseline.xml
@@ -1044,18 +1044,13 @@
     </PropertyNotSetInConstructor>
   </file>
   <file src="src/TextUI/ResultPrinter.php">
-    <DeprecatedClass occurrences="7">
-      <code>LegacyTestResult</code>
-      <code>LegacyTestResult</code>
-      <code>LegacyTestResult</code>
-      <code>LegacyTestResult</code>
-      <code>LegacyTestResult</code>
-      <code>LegacyTestResult</code>
-      <code>LegacyTestResult</code>
-    </DeprecatedClass>
     <MissingThrowsDocblock occurrences="1">
       <code>resourceUsageSinceStartOfRequest</code>
     </MissingThrowsDocblock>
+    <RedundantCondition occurrences="2">
+      <code>assert($test instanceof TestMethod)</code>
+      <code>assert($test instanceof TestMethod)</code>
+    </RedundantCondition>
   </file>
   <file src="src/TextUI/TestRunner.php">
     <DeprecatedClass occurrences="1">
diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
index 0313f96f3d0..acc78800ac8 100644
--- a/src/Framework/TestSuite.php
+++ b/src/Framework/TestSuite.php
@@ -103,18 +103,10 @@ public static function fromClassReflector(ReflectionClass $class): static
         $constructor = $class->getConstructor();
 
         if ($constructor !== null && !$constructor->isPublic()) {
-            $message = sprintf(
-                'Class "%s" has no public constructor.',
-                $class->getName()
-            );
-
-            Event\Facade::emitter()->testRunnerTriggeredWarning($message);
-
-            $testSuite->addTest(
-                new WarningTestCase(
-                    $class->getName(),
-                    '',
-                    $message
+            Event\Facade::emitter()->testRunnerTriggeredWarning(
+                sprintf(
+                    'Class "%s" has no public constructor.',
+                    $class->getName()
                 )
             );
 
@@ -138,18 +130,10 @@ public static function fromClassReflector(ReflectionClass $class): static
         }
 
         if (count($testSuite) === 0) {
-            $message = sprintf(
-                'No tests found in class "%s".',
-                $class->getName()
-            );
-
-            Event\Facade::emitter()->testRunnerTriggeredWarning($message);
-
-            $testSuite->addTest(
-                new WarningTestCase(
-                    $class->getName(),
-                    '',
-                    $message
+            Event\Facade::emitter()->testRunnerTriggeredWarning(
+                sprintf(
+                    'No tests found in class "%s".',
+                    $class->getName()
                 )
             );
         }
diff --git a/src/Runner/TestResult/Collector.php b/src/Runner/TestResult/Collector.php
index 73493afb241..914d827f2fc 100644
--- a/src/Runner/TestResult/Collector.php
+++ b/src/Runner/TestResult/Collector.php
@@ -235,6 +235,19 @@ public function hasTestMarkedIncompleteEvents(): bool
         return !empty($this->testMarkedIncompleteEvents);
     }
 
+    public function hasTestRunnerTriggeredWarningEvents(): bool
+    {
+        return !empty($this->testRunnerTriggeredWarningEvents);
+    }
+
+    /**
+     * @psalm-return list<TestRunnerWarningTriggered>
+     */
+    public function testRunnerTriggeredWarningEvents(): array
+    {
+        return $this->testRunnerTriggeredWarningEvents;
+    }
+
     /**
      * @psalm-return list<class-string>
      */
diff --git a/src/TextUI/Application.php b/src/TextUI/Application.php
index 203648d2506..1bf6241ccbf 100644
--- a/src/TextUI/Application.php
+++ b/src/TextUI/Application.php
@@ -249,6 +249,15 @@ private function handleArguments(array $argv): TestSuite
             exit(self::EXCEPTION_EXIT);
         }
 
+        if ($testSuite->isEmpty() &&
+            ($arguments->hasArgument() || $this->xmlConfiguration->phpunit()->hasDefaultTestSuite())) {
+            $this->printVersionString();
+
+            print 'No tests found.' . PHP_EOL;
+
+            exit(self::EXCEPTION_EXIT);
+        }
+
         if ($configuration->hasCoverageReport() || $arguments->hasWarmCoverageCache()) {
             CodeCoverageFilterRegistry::init($arguments, $this->xmlConfiguration);
         }
diff --git a/src/TextUI/ResultPrinter.php b/src/TextUI/ResultPrinter.php
index a6515188e8a..fd8363562f5 100644
--- a/src/TextUI/ResultPrinter.php
+++ b/src/TextUI/ResultPrinter.php
@@ -10,14 +10,19 @@
 namespace PHPUnit\TextUI;
 
 use const PHP_EOL;
-use PHPUnit\Framework\RiskyTest;
-use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestFailure;
-use PHPUnit\Framework\TestResult as LegacyTestResult;
+use function assert;
+use function count;
+use function sprintf;
+use function str_starts_with;
+use function strlen;
+use function substr;
+use function trim;
+use PHPUnit\Event\Code\Test;
+use PHPUnit\Event\Code\TestMethod;
+use PHPUnit\Event\Test\BeforeFirstTestMethodErrored;
 use PHPUnit\TestRunner\TestResult\TestResult;
 use PHPUnit\Util\Color;
 use PHPUnit\Util\Printer;
-use ReflectionMethod;
 use SebastianBergmann\Timer\ResourceUsageFormatter;
 
 /**
@@ -26,36 +31,36 @@
 final class ResultPrinter
 {
     private Printer $printer;
-    private bool $colors;
+    private bool $colorizeOutput;
     private bool $displayDetailsOnIncompleteTests;
     private bool $displayDetailsOnSkippedTests;
-    private bool $reverse;
-    private bool $defectListPrinted = false;
+    private bool $displayDefectsInReverseOrder;
+    private bool $listPrinted = false;
 
-    public function __construct(Printer $printer, bool $displayDetailsOnIncompleteTests, bool $displayDetailsOnSkippedTests, bool $colors, bool $reverse)
+    public function __construct(Printer $printer, bool $displayDetailsOnIncompleteTests, bool $displayDetailsOnSkippedTests, bool $colorizeOutput, bool $displayDefectsInReverseOrder)
     {
         $this->printer = $printer;
 
         $this->displayDetailsOnIncompleteTests = $displayDetailsOnIncompleteTests;
         $this->displayDetailsOnSkippedTests    = $displayDetailsOnSkippedTests;
-        $this->colors                          = $colors;
-        $this->reverse                         = $reverse;
+        $this->colorizeOutput                  = $colorizeOutput;
+        $this->displayDefectsInReverseOrder    = $displayDefectsInReverseOrder;
     }
 
-    public function printResult(TestResult $result, LegacyTestResult $legacyResult): void
+    public function printResult(TestResult $result): void
     {
         $this->printHeader($result);
-        $this->printTestsWithErrors($result, $legacyResult);
-        $this->printTestsWithWarnings($result, $legacyResult);
-        $this->printTestsWithFailedAssertions($result, $legacyResult);
-        $this->printRiskyTests($result, $legacyResult);
+        $this->printTestsWithErrors($result);
+        $this->printTestsWithWarnings($result);
+        $this->printTestsWithFailedAssertions($result);
+        $this->printRiskyTests($result);
 
         if ($this->displayDetailsOnIncompleteTests) {
-            $this->printIncompleteTests($result, $legacyResult);
+            $this->printIncompleteTests($result);
         }
 
         if ($this->displayDetailsOnSkippedTests) {
-            $this->printSkippedTests($result, $legacyResult);
+            $this->printSkippedTests($result);
         }
 
         $this->printFooter($result);
@@ -73,48 +78,140 @@ private function printHeader(TestResult $result): void
         }
     }
 
-    private function printTestsWithErrors(TestResult $result, LegacyTestResult $legacyResult): void
+    private function printTestsWithErrors(TestResult $result): void
     {
-        $this->printDefects($legacyResult->errors(), 'error');
-    }
+        if (!$result->hasTestErroredEvents()) {
+            return;
+        }
 
-    private function printTestsWithFailedAssertions(TestResult $result, LegacyTestResult $legacyResult): void
-    {
-        $this->printDefects($legacyResult->failures(), 'failure');
+        $elements = [];
+
+        foreach ($result->testErroredEvents() as $event) {
+            if ($event instanceof BeforeFirstTestMethodErrored) {
+                $title = $event->testClassName();
+            } else {
+                $title = $this->name($event->test());
+            }
+
+            $elements[] = [
+                'title' => $title,
+                'body'  => $event->throwable()->asString(),
+            ];
+        }
+
+        $this->printList(count($elements), $elements, 'error');
     }
 
-    private function printTestsWithWarnings(TestResult $result, LegacyTestResult $legacyResult): void
+    private function printTestsWithFailedAssertions(TestResult $result): void
     {
-        $this->printDefects($legacyResult->warnings(), 'warning');
+        if (!$result->hasTestFailedEvents()) {
+            return;
+        }
+
+        $elements = [];
+
+        foreach ($result->testFailedEvents() as $event) {
+            $body = $event->throwable()->asString();
+
+            if (str_starts_with($body, 'AssertionError: ')) {
+                $body = substr($body, strlen('AssertionError: '));
+            }
+
+            $elements[] = [
+                'title' => $this->name($event->test()),
+                'body'  => $body,
+            ];
+        }
+
+        $this->printList(count($elements), $elements, 'failure');
     }
 
-    private function printRiskyTests(TestResult $result, LegacyTestResult $legacyResult): void
+    private function printTestsWithWarnings(TestResult $result): void
     {
-        $this->printDefects($legacyResult->risky(), 'risky test');
     }
 
-    private function printIncompleteTests(TestResult $result, LegacyTestResult $legacyResult): void
+    private function printRiskyTests(TestResult $result): void
     {
-        $this->printDefects($legacyResult->notImplemented(), 'incomplete test');
+        if (!$result->hasTestConsideredRiskyEvents()) {
+            return;
+        }
+
+        $elements = [];
+
+        foreach ($result->testConsideredRiskyEvents() as $reasons) {
+            foreach ($reasons as $reason) {
+                $body = $reason->message() . PHP_EOL;
+                $test = $reason->test();
+
+                if ($test->isTestMethod()) {
+                    assert($test instanceof TestMethod);
+
+                    $body .= sprintf(
+                        '%s%s:%d%s',
+                        PHP_EOL,
+                        $test->file(),
+                        $test->line(),
+                        PHP_EOL
+                    );
+                }
+
+                $elements[] = [
+                    'title' => $this->name($test),
+                    'body'  => $body,
+                ];
+            }
+        }
+
+        $this->printList($result->numberOfTestsWithTestConsideredRiskyEvents(), $elements, 'risky test');
     }
 
-    private function printSkippedTests(TestResult $result, LegacyTestResult $legacyResult): void
+    private function printIncompleteTests(TestResult $result): void
     {
-        $this->printDefects($legacyResult->skipped(), 'skipped test');
+        if (!$result->hasTestMarkedIncompleteEvents()) {
+            return;
+        }
+
+        $elements = [];
+
+        foreach ($result->testMarkedIncompleteEvents() as $event) {
+            $elements[] = [
+                'title' => $this->name($event->test()),
+                'body'  => $event->throwable()->asString(),
+            ];
+        }
+
+        $this->printList(count($elements), $elements, 'incomplete test');
     }
 
-    private function printDefects(array $defects, string $type): void
+    private function printSkippedTests(TestResult $result): void
     {
-        $count = count($defects);
-
-        if ($count === 0) {
+        if (!$result->hasTestSkippedEvents()) {
             return;
         }
 
-        if ($this->defectListPrinted) {
+        $elements = [];
+
+        foreach ($result->testSkippedEvents() as $event) {
+            $elements[] = [
+                'title' => $this->name($event->test()),
+                'body'  => $event->message(),
+            ];
+        }
+
+        $this->printList(count($elements), $elements, 'skipped test');
+    }
+
+    /**
+     * @psalm-param list<array{title: string, body: string}> $elements
+     */
+    private function printList(int $count, array $elements, string $type): void
+    {
+        if ($this->listPrinted) {
             $this->printer->print("\n--\n\n");
         }
 
+        $this->listPrinted = true;
+
         $this->printer->print(
             sprintf(
                 "There %s %d %s%s:\n",
@@ -127,64 +224,27 @@ private function printDefects(array $defects, string $type): void
 
         $i = 1;
 
-        if ($this->reverse) {
-            $defects = array_reverse($defects);
+        if ($this->displayDefectsInReverseOrder) {
+            $elements = array_reverse($elements);
         }
 
-        foreach ($defects as $defect) {
-            $this->printDefect($defect, $i++);
+        foreach ($elements as $element) {
+            $this->printListElement($i++, $element['title'], $element['body']);
         }
-
-        $this->defectListPrinted = true;
     }
 
-    private function printDefect(TestFailure $defect, int $index): void
-    {
-        $this->printDefectHeader($index, $defect->getTestName());
-        $this->printDefectTrace($defect);
-    }
-
-    private function printDefectHeader(int $index, string $testName): void
+    private function printListElement(int $number, string $title, string $body): void
     {
         $this->printer->print(
             sprintf(
-                "\n%d) %s\n",
-                $index,
-                $testName
+                "\n%d) %s\n%s\n",
+                $number,
+                $title,
+                trim($body)
             )
         );
     }
 
-    private function printDefectTrace(TestFailure $defect): void
-    {
-        $e = $defect->thrownException();
-
-        $this->printer->print((string) $e);
-
-        if ($defect->thrownException() instanceof RiskyTest) {
-            $test = $defect->failedTest();
-
-            assert($test instanceof TestCase);
-
-            /** @noinspection PhpUnhandledExceptionInspection */
-            $reflector = new ReflectionMethod($test::class, $test->getName(false));
-
-            $this->printer->print(
-                sprintf(
-                    '%s%s:%d%s',
-                    PHP_EOL,
-                    $reflector->getFileName(),
-                    $reflector->getStartLine(),
-                    PHP_EOL
-                )
-            );
-        } else {
-            while ($e = $e->getPrevious()) {
-                $this->printer->print("\nCaused by\n" . $e);
-            }
-        }
-    }
-
     private function printFooter(TestResult $result): void
     {
         if ($result->numberOfTestsRun() === 0) {
@@ -280,7 +340,7 @@ private function printCountString(int $count, string $name, string $color, bool
 
     private function printWithColor(string $color, string $buffer, bool $lf = true): void
     {
-        if ($this->colors) {
+        if ($this->colorizeOutput) {
             $buffer = Color::colorizeTextBox($color, $buffer);
         }
 
@@ -290,4 +350,15 @@ private function printWithColor(string $color, string $buffer, bool $lf = true):
             $this->printer->print(PHP_EOL);
         }
     }
+
+    private function name(Test $test): string
+    {
+        if ($test->isTestMethod()) {
+            assert($test instanceof TestMethod);
+
+            return $test->nameWithClass();
+        }
+
+        return $test->name();
+    }
 }
diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
index 1005d9f9225..be2e5b1e1d0 100644
--- a/src/TextUI/TestRunner.php
+++ b/src/TextUI/TestRunner.php
@@ -393,7 +393,7 @@ public function run(TestSuite $suite): TestResult
         $result = Facade::result();
 
         if (isset($resultPrinter)) {
-            $resultPrinter->printResult($result, $legacyResult);
+            $resultPrinter->printResult($result);
         }
 
         if (isset($junitXmlLogger)) {
diff --git a/tests/_files/NotVoidTestCase.php b/tests/_files/NotVoidTestCase.php
deleted file mode 100644
index e246f11085d..00000000000
--- a/tests/_files/NotVoidTestCase.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php declare(strict_types=1);
-/*
- * 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\TestFixture;
-
-use PHPUnit\Framework\TestCase;
-
-class NotVoidTestCase extends TestCase
-{
-}
diff --git a/tests/end-to-end/event/_files/PrivateTest.php b/tests/end-to-end/event/_files/PrivateTest.php
deleted file mode 100644
index 0d9517422d2..00000000000
--- a/tests/end-to-end/event/_files/PrivateTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php declare(strict_types=1);
-/*
- * 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\TestFixture\Event;
-
-use PHPUnit\Framework\TestCase;
-
-final class PrivateTest extends TestCase
-{
-    private function __construct()
-    {
-    }
-}
diff --git a/tests/end-to-end/event/test-class-with-private-constructor.phpt b/tests/end-to-end/event/test-class-with-private-constructor.phpt
deleted file mode 100644
index 7cb46be096f..00000000000
--- a/tests/end-to-end/event/test-class-with-private-constructor.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-The right events are emitted in the right order for a test class that has a non-public constructor
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
---FILE--
-<?php declare(strict_types=1);
-$traceFile = tempnam(sys_get_temp_dir(), __FILE__);
-
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--no-output';
-$_SERVER['argv'][] = '--log-events-text';
-$_SERVER['argv'][] = $traceFile;
-$_SERVER['argv'][] = __DIR__ . '/_files/PrivateTest.php';
-
-require __DIR__ . '/../../bootstrap.php';
-
-PHPUnit\TextUI\Application::main(false);
-
-print file_get_contents($traceFile);
-
-unlink($traceFile);
---EXPECTF--
-Test Runner Started (PHPUnit %s using %s)
-Test Runner Configured
-Test Runner Triggered Warning (Class "PHPUnit\TestFixture\Event\PrivateTest" has no public constructor.)
-Test Suite Loaded (1 test)
-Test Suite Sorted
-Event Facade Sealed
-Test Runner Execution Started (1 test)
-Test Suite Started (PHPUnit\TestFixture\Event\PrivateTest, 1 test)
-Test Preparation Started (PHPUnit\TestFixture\Event\PrivateTest::)
-Test Prepared (PHPUnit\TestFixture\Event\PrivateTest::)
-Test Passed With Warning (PHPUnit\TestFixture\Event\PrivateTest::)
-Class "PHPUnit\TestFixture\Event\PrivateTest" has no public constructor.
-Test Finished (PHPUnit\TestFixture\Event\PrivateTest::)
-Test Suite Finished (PHPUnit\TestFixture\Event\PrivateTest, 1 test)
-Test Runner Execution Finished
-Test Runner Finished
diff --git a/tests/end-to-end/event/test-class-without-test-methods.phpt b/tests/end-to-end/event/test-class-without-test-methods.phpt
deleted file mode 100644
index 4854bc148d3..00000000000
--- a/tests/end-to-end/event/test-class-without-test-methods.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-The right events are emitted in the right order for a test class that has no test methods
---SKIPIF--
-<?php declare(strict_types=1);
-if (DIRECTORY_SEPARATOR === '\\') {
-    print "skip: this test does not work on Windows / GitHub Actions\n";
-}
---FILE--
-<?php declare(strict_types=1);
-$traceFile = tempnam(sys_get_temp_dir(), __FILE__);
-
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--no-output';
-$_SERVER['argv'][] = '--log-events-text';
-$_SERVER['argv'][] = $traceFile;
-$_SERVER['argv'][] = __DIR__ . '/_files/EmptyTest.php';
-
-require __DIR__ . '/../../bootstrap.php';
-
-PHPUnit\TextUI\Application::main(false);
-
-print file_get_contents($traceFile);
-
-unlink($traceFile);
---EXPECTF--
-Test Runner Started (PHPUnit %s using %s)
-Test Runner Configured
-Test Runner Triggered Warning (No tests found in class "PHPUnit\TestFixture\Event\EmptyTest".)
-Test Suite Loaded (1 test)
-Test Suite Sorted
-Event Facade Sealed
-Test Runner Execution Started (1 test)
-Test Suite Started (PHPUnit\TestFixture\Event\EmptyTest, 1 test)
-Test Preparation Started (PHPUnit\TestFixture\Event\EmptyTest::)
-Test Prepared (PHPUnit\TestFixture\Event\EmptyTest::)
-Test Passed With Warning (PHPUnit\TestFixture\Event\EmptyTest::)
-No tests found in class "PHPUnit\TestFixture\Event\EmptyTest".
-Test Finished (PHPUnit\TestFixture\Event\EmptyTest::)
-Test Suite Finished (PHPUnit\TestFixture\Event\EmptyTest, 1 test)
-Test Runner Execution Finished
-Test Runner Finished
diff --git a/tests/end-to-end/generic/assertion.phpt b/tests/end-to-end/generic/assertion.phpt
index 6135d21e171..a4ccbca8e40 100644
--- a/tests/end-to-end/generic/assertion.phpt
+++ b/tests/end-to-end/generic/assertion.phpt
@@ -29,7 +29,10 @@ Time: %s, Memory: %s
 There was 1 failure:
 
 1) PHPUnit\TestFixture\AssertionExampleTest::testOne
-assert(false) in %sAssertionExample.php:%d
+assert(false)
+
+%s:%i
+%s:%i
 
 FAILURES!
 Tests: 1, Assertions: 1, Failures: 1.
diff --git a/tests/end-to-end/generic/dataprovider-log-xml-isolation.phpt b/tests/end-to-end/generic/dataprovider-log-xml-isolation.phpt
index 6e1e1349790..9eba106f4bf 100644
--- a/tests/end-to-end/generic/dataprovider-log-xml-isolation.phpt
+++ b/tests/end-to-end/generic/dataprovider-log-xml-isolation.phpt
@@ -22,7 +22,7 @@ Time: %s, Memory: %s
 
 There was 1 failure:
 
-1) PHPUnit\TestFixture\DataProviderTest::testAdd with data set #2 (1, 1, 3)
+1) PHPUnit\TestFixture\DataProviderTest::testAdd with data set #2
 Failed asserting that 2 matches expected 3.
 
 %s:%i
diff --git a/tests/end-to-end/generic/dataprovider-log-xml.phpt b/tests/end-to-end/generic/dataprovider-log-xml.phpt
index f7385b059c2..5d9e1ec3a6a 100644
--- a/tests/end-to-end/generic/dataprovider-log-xml.phpt
+++ b/tests/end-to-end/generic/dataprovider-log-xml.phpt
@@ -21,7 +21,7 @@ Time: %s, Memory: %s
 
 There was 1 failure:
 
-1) PHPUnit\TestFixture\DataProviderTest::testAdd with data set #2 (1, 1, 3)
+1) PHPUnit\TestFixture\DataProviderTest::testAdd with data set #2
 Failed asserting that 2 matches expected 3.
 
 %s:%i
diff --git a/tests/end-to-end/generic/empty-testcase.phpt b/tests/end-to-end/generic/empty-testcase.phpt
index 1791708cc91..0d43ae33741 100644
--- a/tests/end-to-end/generic/empty-testcase.phpt
+++ b/tests/end-to-end/generic/empty-testcase.phpt
@@ -11,16 +11,4 @@ PHPUnit\TextUI\Application::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-Runtime: %s
-
-W                                                                   1 / 1 (100%)
-
-Time: %s, Memory: %s
-
-There was 1 warning:
-
-1) Warning
-No tests found in class "PHPUnit\TestFixture\EmptyTestCaseTest".
-
-WARNINGS!
-Tests: 1, Assertions: 0, Warnings: 1.
+No tests found.
diff --git a/tests/end-to-end/phpt/phpt-parsing.phpt b/tests/end-to-end/phpt/phpt-parsing.phpt
index eeeb0d3a417..f4cc8ab2516 100644
--- a/tests/end-to-end/phpt/phpt-parsing.phpt
+++ b/tests/end-to-end/phpt/phpt-parsing.phpt
@@ -20,7 +20,7 @@ Time: %s, Memory: %s
 There was 1 error:
 
 1) %stests%e_files%ephpt-unsupported-section.phpt
-PHPUnit\Runner\Exception: PHPUnit does not support PHPT GET sections in %s
-%a
+PHPUnit\Runner\Exception: PHPUnit does not support PHPT GET sections
+
 ERRORS!
 Tests: 1, Assertions: 0, Errors: 1.
diff --git a/tests/end-to-end/phpt/skipif-location-hint.phpt b/tests/end-to-end/phpt/skipif-location-hint.phpt
deleted file mode 100644
index c9386474594..00000000000
--- a/tests/end-to-end/phpt/skipif-location-hint.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-PHPT skip condition results in correct code location hint
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--display-skipped';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = \realpath(__DIR__ . '/../_files/phpt-skipif-location-hint-example.phpt');
-
-require_once __DIR__ . '/../../bootstrap.php';
-
-PHPUnit\TextUI\Application::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-Runtime:       %s
-
-S                                                                   1 / 1 (100%)
-
-Time: %s, Memory: %s
-
-There was 1 skipped test:
-
-1) %stests%eend-to-end%e_files%ephpt-skipif-location-hint-example.phpt
-something terrible happened
-
-%stests%eend-to-end%e_files%ephpt-skipif-location-hint-example.phpt:8
-
-OK, but incomplete, skipped, or risky tests!
-Tests: 1, Assertions: 0, Skipped: 1.
diff --git a/tests/end-to-end/regression/1570.phpt b/tests/end-to-end/regression/1570.phpt
index eba7baa971b..17bf9af9090 100644
--- a/tests/end-to-end/regression/1570.phpt
+++ b/tests/end-to-end/regression/1570.phpt
@@ -23,7 +23,7 @@ There was 1 risky test:
 1) PHPUnit\TestFixture\Issue1570Test::testOne
 This test printed output: *
 
-%s:16
+%s:%d
 
 OK, but incomplete, skipped, or risky tests!
 Tests: 1, Assertions: 1, Risky: 1.
diff --git a/tests/end-to-end/regression/2137-filter.phpt b/tests/end-to-end/regression/2137-filter.phpt
index d3b4813c6c2..1abce0a8ab7 100644
--- a/tests/end-to-end/regression/2137-filter.phpt
+++ b/tests/end-to-end/regression/2137-filter.phpt
@@ -21,7 +21,7 @@ Time: %s, Memory: %s
 
 There was 1 error:
 
-1) Error
+1) PHPUnit\TestFixture\Issue2137Test::testBrandService
 The data provider specified for PHPUnit\TestFixture\Issue2137Test::testBrandService is invalid
 Data set #0 is invalid
 
diff --git a/tests/end-to-end/regression/2137-no_filter.phpt b/tests/end-to-end/regression/2137-no_filter.phpt
index 057099dace0..9e202596369 100644
--- a/tests/end-to-end/regression/2137-no_filter.phpt
+++ b/tests/end-to-end/regression/2137-no_filter.phpt
@@ -19,11 +19,11 @@ Time: %s, Memory: %s
 
 There were 2 errors:
 
-1) Error
+1) PHPUnit\TestFixture\Issue2137Test::testBrandService
 The data provider specified for PHPUnit\TestFixture\Issue2137Test::testBrandService is invalid
 Data set #0 is invalid
 
-2) Error
+2) PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid
 The data provider specified for PHPUnit\TestFixture\Issue2137Test::testSomethingElseInvalid is invalid
 Data set #0 is invalid
 
diff --git a/tests/end-to-end/regression/2145.phpt b/tests/end-to-end/regression/2145.phpt
index 3e507615336..ae95728ea4d 100644
--- a/tests/end-to-end/regression/2145.phpt
+++ b/tests/end-to-end/regression/2145.phpt
@@ -20,8 +20,10 @@ Time: %s, Memory: %s
 
 There was 1 error:
 
-1) PHPUnit\TestFixture\Issue2145Test::testOne
-Exception in %s%eIssue2145Test.php:%d
-%A
+1) PHPUnit\TestFixture\Issue2145Test
+Exception: message
+
+%s:%d
+
 ERRORS!
 Tests: 1, Assertions: 0, Errors: 1.
diff --git a/tests/end-to-end/regression/2145/Issue2145Test.php b/tests/end-to-end/regression/2145/Issue2145Test.php
index 9152b06d53d..3eabdf10491 100644
--- a/tests/end-to-end/regression/2145/Issue2145Test.php
+++ b/tests/end-to-end/regression/2145/Issue2145Test.php
@@ -16,7 +16,7 @@ class Issue2145Test extends TestCase
 {
     public static function setUpBeforeClass(): void
     {
-        throw new Exception;
+        throw new Exception('message');
     }
 
     public function testOne(): void
diff --git a/tests/end-to-end/regression/498.phpt b/tests/end-to-end/regression/498.phpt
index 3cb6a6a1e1a..ce6da6e07a2 100644
--- a/tests/end-to-end/regression/498.phpt
+++ b/tests/end-to-end/regression/498.phpt
@@ -21,7 +21,7 @@ Time: %s, Memory: %s
 
 There was 1 error:
 
-1) Error
+1) PHPUnit\TestFixture\Issue498Test::shouldBeFalse
 The data provider specified for PHPUnit\TestFixture\Issue498Test::shouldBeFalse is invalid
 Exception: Can't create the data
 %sIssue498Test.php:%d
diff --git a/tests/end-to-end/regression/765.phpt b/tests/end-to-end/regression/765.phpt
index fcf5c44d5ae..91abb079853 100644
--- a/tests/end-to-end/regression/765.phpt
+++ b/tests/end-to-end/regression/765.phpt
@@ -19,7 +19,7 @@ Time: %s, Memory: %s
 
 There was 1 error:
 
-1) Error
+1) PHPUnit\TestFixture\Issue765Test::testDependent
 The data provider specified for PHPUnit\TestFixture\Issue765Test::testDependent is invalid
 Exception: <no message>
 %sIssue765Test.php:%d
diff --git a/tests/end-to-end/risky-tests/global-state.phpt b/tests/end-to-end/risky-tests/global-state.phpt
index d4666a1db2c..00fad354ae8 100644
--- a/tests/end-to-end/risky-tests/global-state.phpt
+++ b/tests/end-to-end/risky-tests/global-state.phpt
@@ -22,6 +22,7 @@ Time: %s, Memory: %s
 There was 1 risky test:
 
 1) PHPUnit\TestFixture\RiskyTests\GlobalStateManipulatorTest::testManipulatesGlobalState
+This test modified global state but was not expected to do so
 --- Global variables before the test
 +++ Global variables after the test
 @@ @@
@@ -29,5 +30,7 @@ There was 1 risky test:
 +    'foo' => 'bar'
 %A
 
+%s:%d
+
 OK, but incomplete, skipped, or risky tests!
 Tests: 1, Assertions: 1, Risky: 1.
diff --git a/tests/unit/Framework/TestSuiteTest.php b/tests/unit/Framework/TestSuiteTest.php
index faae1ea6ff0..f30d6d5eb4a 100644
--- a/tests/unit/Framework/TestSuiteTest.php
+++ b/tests/unit/Framework/TestSuiteTest.php
@@ -19,7 +19,6 @@
 use PHPUnit\TestFixture\DoubleTestCase;
 use PHPUnit\TestFixture\MultiDependencyTest;
 use PHPUnit\TestFixture\NotPublicTestCase;
-use PHPUnit\TestFixture\NotVoidTestCase;
 use PHPUnit\TestFixture\PreConditionAndPostConditionTest;
 use PHPUnit\TestFixture\Success;
 use ReflectionClass;
@@ -35,13 +34,6 @@ public function testNotPublicTestCase(): void
         $this->assertCount(1, $suite);
     }
 
-    public function testNotVoidTestCase(): void
-    {
-        $suite = TestSuite::fromClassName(NotVoidTestCase::class);
-
-        $this->assertCount(1, $suite);
-    }
-
     public function testBeforeAndAfterAnnotations(): void
     {
         $test = TestSuite::fromClassName(BeforeAndAfterTest::class);
diff --git a/tests/unit/Runner/TestSuiteSorterTest.php b/tests/unit/Runner/TestSuiteSorterTest.php
index a4055abd1f2..cdd93ded2c3 100644
--- a/tests/unit/Runner/TestSuiteSorterTest.php
+++ b/tests/unit/Runner/TestSuiteSorterTest.php
@@ -17,7 +17,6 @@
 use PHPUnit\Framework\TestStatus\TestStatus;
 use PHPUnit\Framework\TestSuite;
 use PHPUnit\Runner\ResultCache\DefaultResultCache;
-use PHPUnit\TestFixture\EmptyTestCaseTest;
 use PHPUnit\TestFixture\FailureTest;
 use PHPUnit\TestFixture\MultiDependencyTest;
 use PHPUnit\TestFixture\NotReorderableTest;
@@ -577,28 +576,6 @@ public function defectsSorterOptionsProvider(): array
         ];
     }
 
-    /**
-     * @see https://github.com/lstrojny/phpunit-clever-and-smart/issues/38
-     */
-    public function testCanHandleSuiteWithEmptyTestCase(): void
-    {
-        $suite = TestSuite::empty();
-        $suite->addTestSuite(new ReflectionClass(EmptyTestCaseTest::class));
-
-        $sorter = new TestSuiteSorter;
-
-        $sorter->reorderTestsInSuite($suite, TestSuiteSorter::ORDER_DEFAULT, false, TestSuiteSorter::ORDER_DEFAULT);
-
-        $this->assertSame(EmptyTestCaseTest::class, $suite->tests()[0]->getName());
-        $this->assertSame(
-            sprintf(
-                'No tests found in class "%s".',
-                EmptyTestCaseTest::class
-            ),
-            $suite->tests()[0]->tests()[0]->getMessage()
-        );
-    }
-
     public function suiteSorterOptionPermutationsProvider(): array
     {
         $orderValues        = [TestSuiteSorter::ORDER_DEFAULT, TestSuiteSorter::ORDER_REVERSED, TestSuiteSorter::ORDER_RANDOMIZED];