diff --git a/tests/_files/NotSelfDescribingTest.php b/tests/_files/NotSelfDescribingTest.php
new file mode 100644
index 00000000000..e48389f3c6e
--- /dev/null
+++ b/tests/_files/NotSelfDescribingTest.php
@@ -0,0 +1,22 @@
+<?php
+
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestResult;
+
+class NotSelfDescribingTest implements Test
+{
+    public function log($msg): void
+    {
+        print $msg;
+    }
+
+    public function count(): int
+    {
+        return 0;
+    }
+
+    public function run(TestResult $result = null): TestResult
+    {
+        return new TestResult();
+    }
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 22639815a23..f10c55de0fe 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -39,6 +39,8 @@
 
 require_once TEST_FILES_PATH . 'NotPublicTestCase.php';
 
+require_once TEST_FILES_PATH . 'NotSelfDescribingTest.php';
+
 require_once TEST_FILES_PATH . 'NotVoidTestCase.php';
 
 require_once TEST_FILES_PATH . 'OverrideTestCase.php';
diff --git a/tests/unit/Framework/TestFailureTest.php b/tests/unit/Framework/TestFailureTest.php
index 5654a1a2374..57a32a54163 100644
--- a/tests/unit/Framework/TestFailureTest.php
+++ b/tests/unit/Framework/TestFailureTest.php
@@ -9,6 +9,9 @@
  */
 namespace PHPUnit\Framework;
 
+use PHPUnit\Framework\Error\Error;
+use SebastianBergmann\Comparator\ComparisonFailure;
+
 class TestFailureTest extends TestCase
 {
     public function testToString(): void
@@ -29,6 +32,15 @@ public function testToStringForError(): void
         $this->assertEquals(__METHOD__ . ': message', $failure->toString());
     }
 
+    public function testToStringForNonSelfDescribing(): void
+    {
+        $test      = new \NotSelfDescribingTest();
+        $exception = new Exception('message');
+        $failure   = new TestFailure($test, $exception);
+
+        $this->assertEquals('NotSelfDescribingTest: message', $failure->toString());
+    }
+
     public function testgetExceptionAsString(): void
     {
         $test      = new self(__FUNCTION__);
@@ -37,4 +49,93 @@ public function testgetExceptionAsString(): void
 
         $this->assertEquals("Error: message\n", $failure->getExceptionAsString());
     }
+
+    public function testExceptionToString(): void
+    {
+        $exception = new AssertionFailedError('message');
+
+        $this->assertEquals("message\n", TestFailure::exceptionToString($exception));
+    }
+
+    public function testExceptionToStringForExpectationFailedException(): void
+    {
+        $exception = new ExpectationFailedException('message');
+
+        $this->assertEquals("message\n", TestFailure::exceptionToString($exception));
+    }
+
+    public function testExceptionToStringForExpectationFailedExceptionWithComparisonFailure(): void
+    {
+        $exception = new ExpectationFailedException('message', new ComparisonFailure('expected', 'actual', 'expected', 'actual'));
+
+        $this->assertEquals("message\n--- Expected\n+++ Actual\n@@ @@\n-expected\n+actual\n", TestFailure::exceptionToString($exception));
+    }
+
+    public function testExceptionToStringForFrameworkError(): void
+    {
+        $exception = new Error('message', 0, 'file', 1);
+
+        $this->assertEquals("message\n", TestFailure::exceptionToString($exception));
+    }
+
+    public function testExceptionToStringForExceptionWrapper(): void
+    {
+        $exception = new ExceptionWrapper(new \Error('message'));
+
+        $this->assertEquals("Error: message\n", TestFailure::exceptionToString($exception));
+    }
+
+    public function testGetTestName(): void
+    {
+        $test      = new self(__FUNCTION__);
+        $exception = new Exception('message');
+        $failure   = new TestFailure($test, $exception);
+
+        $this->assertEquals($this->toString(), $failure->getTestName());
+    }
+
+    public function testFailedTest(): void
+    {
+        $test      = new self(__FUNCTION__);
+        $exception = new Exception('message');
+        $failure   = new TestFailure($test, $exception);
+
+        $this->assertEquals($test, $failure->failedTest());
+    }
+
+    public function testThrownException(): void
+    {
+        $test      = new self(__FUNCTION__);
+        $exception = new Exception('message');
+        $failure   = new TestFailure($test, $exception);
+
+        $this->assertEquals($exception, $failure->thrownException());
+    }
+
+    public function testExceptionMessage(): void
+    {
+        $test      = new self(__FUNCTION__);
+        $exception = new Exception('message');
+        $failure   = new TestFailure($test, $exception);
+
+        $this->assertEquals('message', $failure->exceptionMessage());
+    }
+
+    public function testIsFailure(): void
+    {
+        $test      = new self(__FUNCTION__);
+        $exception = new ExpectationFailedException('message');
+        $failure   = new TestFailure($test, $exception);
+
+        $this->assertTrue($failure->isFailure());
+    }
+
+    public function testIsFailureFalse(): void
+    {
+        $test      = new self(__FUNCTION__);
+        $exception = new Warning('message');
+        $failure   = new TestFailure($test, $exception);
+
+        $this->assertFalse($failure->isFailure());
+    }
 }