diff --git a/tests/Framework/Constraint/IsJsonTest.php b/tests/Framework/Constraint/IsJsonTest.php
@@ -8,7 +8,9 @@
  * file that was distributed with this source code.
  */
 
-class Framework_Constraint_IsJsonTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Framework_Constraint_IsJsonTest extends TestCase
 {
     /**
      * @dataProvider evaluateDataprovider

diff --git a/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php b/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
@@ -7,11 +7,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+use PHPUnit\Framework\TestCase;
 
 /**
  * @since      File available since Release 3.7.0
  */
-class Framework_Constraint_JsonMatches_ErrorMessageProviderTest extends PHPUnit_Framework_TestCase
+class Framework_Constraint_JsonMatches_ErrorMessageProviderTest extends TestCase
 {
     /**
      * @dataProvider translateTypeToPrefixDataprovider

diff --git a/tests/Framework/Constraint/JsonMatchesTest.php b/tests/Framework/Constraint/JsonMatchesTest.php
@@ -7,11 +7,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+use PHPUnit\Framework\TestCase;
 
 /**
  * @since      File available since Release 3.7.0
  */
-class Framework_Constraint_JsonMatchesTest extends PHPUnit_Framework_TestCase
+class Framework_Constraint_JsonMatchesTest extends TestCase
 {
     /**
      * @dataProvider evaluateDataprovider

diff --git a/tests/Framework/ConstraintTest.php b/tests/Framework/ConstraintTest.php
@@ -10,11 +10,12 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @since      Class available since Release 3.0.0
  */
-class Framework_ConstraintTest extends PHPUnit_Framework_TestCase
+class Framework_ConstraintTest extends TestCase
 {
     /**
      * @covers PHPUnit_Framework_Constraint_ArrayHasKey

diff --git a/tests/Framework/SuiteTest.php b/tests/Framework/SuiteTest.php
@@ -8,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+use PHPUnit\Framework\TestCase;
+
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'BeforeAndAfterTest.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'BeforeClassAndAfterClassTest.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'TestWithTest.php';
@@ -26,7 +28,7 @@
  * @since      Class available since Release 2.0.0
  * @covers     PHPUnit_Framework_TestSuite
  */
-class Framework_SuiteTest extends PHPUnit_Framework_TestCase
+class Framework_SuiteTest extends TestCase
 {
     protected $result;
 

diff --git a/tests/Framework/TestCaseTest.php b/tests/Framework/TestCaseTest.php
@@ -8,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+use PHPUnit\Framework\TestCase;
+
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NoArgTestCaseTest.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Singleton.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Mockable.php';
@@ -24,9 +26,9 @@
 
 /**
  * @since      Class available since Release 2.0.0
- * @covers     PHPUnit_Framework_TestCase
+ * @covers     TestCase
  */
-class Framework_TestCaseTest extends PHPUnit_Framework_TestCase
+class Framework_TestCaseTest extends TestCase
 {
     protected $backupGlobalsBlacklist = ['i', 'singleton'];
 

diff --git a/tests/Framework/TestFailureTest.php b/tests/Framework/TestFailureTest.php
@@ -8,11 +8,12 @@
  * file that was distributed with this source code.
  */
 use PHPUnit\Framework\Exception;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @since      File available since Release 3.7.20
  */
-class Framework_TestFailureTest extends PHPUnit_Framework_TestCase
+class Framework_TestFailureTest extends TestCase
 {
     /**
      * @covers PHPUnit_Framework_TestFailure::toString

diff --git a/tests/Framework/TestImplementorTest.php b/tests/Framework/TestImplementorTest.php
@@ -7,14 +7,15 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+use PHPUnit\Framework\TestCase;
 
 /**
  * @since      Class available since Release 2.0.0
  */
-class Framework_TestImplementorTest extends PHPUnit_Framework_TestCase
+class Framework_TestImplementorTest extends TestCase
 {
     /**
-     * @covers PHPUnit_Framework_TestCase
+     * @covers TestCase
      */
     public function testSuccessfulRun()
     {

diff --git a/tests/Framework/TestListenerTest.php b/tests/Framework/TestListenerTest.php
@@ -8,13 +8,14 @@
  * file that was distributed with this source code.
  */
 use PHPUnit\Framework\AssertionFailedError;
+use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Test;
 
 /**
  * @since      Class available since Release 2.0.0
- * @covers     PHPUnit_Framework_TestCase
+ * @covers     TestCase
  */
-class Framework_TestListenerTest extends PHPUnit_Framework_TestCase implements PHPUnit_Framework_TestListener
+class Framework_TestListenerTest extends TestCase implements PHPUnit_Framework_TestListener
 {
     protected $endCount;
     protected $errorCount;

diff --git a/tests/Regression/GitHub/1149/Issue1149Test.php b/tests/Regression/GitHub/1149/Issue1149Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1149Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1149Test extends TestCase
 {
     public function testOne()
     {

diff --git a/tests/Regression/GitHub/1216/Issue1216Test.php b/tests/Regression/GitHub/1216/Issue1216Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1216Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1216Test extends TestCase
 {
     public function testConfigAvailableInBootstrap()
     {

diff --git a/tests/Regression/GitHub/1265/Issue1265Test.php b/tests/Regression/GitHub/1265/Issue1265Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1265Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1265Test extends TestCase
 {
     public function testTrue()
     {

diff --git a/tests/Regression/GitHub/1330/Issue1330Test.php b/tests/Regression/GitHub/1330/Issue1330Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1330Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1330Test extends TestCase
 {
     public function testTrue()
     {

diff --git a/tests/Regression/GitHub/1335/Issue1335Test.php b/tests/Regression/GitHub/1335/Issue1335Test.php
@@ -1,9 +1,11 @@
 <?php
+use PHPUnit\Framework\TestCase;
+
 /**
  * @runTestsInSeparateProcesses
  * @preserveGlobalState enabled
  */
-class Issue1335Test extends PHPUnit_Framework_TestCase
+class Issue1335Test extends TestCase
 {
     public function testGlobalString()
     {

diff --git a/tests/Regression/GitHub/1337/Issue1337Test.php b/tests/Regression/GitHub/1337/Issue1337Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1337Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1337Test extends TestCase
 {
     /**
      * @dataProvider dataProvider

diff --git a/tests/Regression/GitHub/1348/Issue1348Test.php b/tests/Regression/GitHub/1348/Issue1348Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1348Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1348Test extends TestCase
 {
     public function testSTDOUT()
     {

diff --git a/tests/Regression/GitHub/1351/Issue1351Test.php b/tests/Regression/GitHub/1351/Issue1351Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1351Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1351Test extends TestCase
 {
     protected $instance;
 

diff --git a/tests/Regression/GitHub/1374/Issue1374Test.php b/tests/Regression/GitHub/1374/Issue1374Test.php
@@ -1,8 +1,10 @@
 <?php
+use PHPUnit\Framework\TestCase;
+
 /**
  * @requires extension I_DO_NOT_EXIST
  */
-class Issue1374Test extends PHPUnit_Framework_TestCase
+class Issue1374Test extends TestCase
 {
     protected function setUp()
     {

diff --git a/tests/Regression/GitHub/1437/Issue1437Test.php b/tests/Regression/GitHub/1437/Issue1437Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1437Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1437Test extends TestCase
 {
     public function testFailure()
     {

diff --git a/tests/Regression/GitHub/1468/Issue1468Test.php b/tests/Regression/GitHub/1468/Issue1468Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1468Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1468Test extends TestCase
 {
     /**
      * @todo Implement this test

diff --git a/tests/Regression/GitHub/1471.phpt b/tests/Regression/GitHub/1471.phpt
@@ -20,7 +20,7 @@ There was 1 failure:
 1) Issue1471Test::testFailure
 Failed asserting that false is true.
 
-%s/Issue1471Test.php:10
+%s/Issue1471Test.php:%d
 
 FAILURES!
 Tests: 1, Assertions: 1, Failures: 1.
diff --git a/tests/Regression/GitHub/1471/Issue1471Test.php b/tests/Regression/GitHub/1471/Issue1471Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1471Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1471Test extends TestCase
 {
     public function testFailure()
     {

diff --git a/tests/Regression/GitHub/1472/Issue1472Test.php b/tests/Regression/GitHub/1472/Issue1472Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1472Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1472Test extends TestCase
 {
     public function testAssertEqualXMLStructure()
     {

diff --git a/tests/Regression/GitHub/1570/Issue1570Test.php b/tests/Regression/GitHub/1570/Issue1570Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1570Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1570Test extends TestCase
 {
     public function testOne()
     {

diff --git a/tests/Regression/GitHub/2158/Issue2158Test.php b/tests/Regression/GitHub/2158/Issue2158Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue2158Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue2158Test extends TestCase
 {
     /**
      * Set constant in main process

diff --git a/tests/Regression/GitHub/2366/Issue2366Test.php b/tests/Regression/GitHub/2366/Issue2366Test.php
@@ -1,12 +1,14 @@
 <?php
+use PHPUnit\Framework\TestCase;
+
 class Issue2366
 {
     public function foo()
     {
     }
 }
 
-class Issue2366Test extends PHPUnit_Framework_TestCase
+class Issue2366Test extends TestCase
 {
     /**
      * @dataProvider provider

diff --git a/tests/Regression/GitHub/2380/Issue2380Test.php b/tests/Regression/GitHub/2380/Issue2380Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue2380Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue2380Test extends TestCase
 {
     /**
      * @dataProvider generatorData

diff --git a/tests/Regression/GitHub/2382/Issue2382Test.php b/tests/Regression/GitHub/2382/Issue2382Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue2382Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue2382Test extends TestCase
 {
     /**
      * @dataProvider dataProvider

diff --git a/tests/Regression/GitHub/244/Issue244Test.php b/tests/Regression/GitHub/244/Issue244Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue244Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue244Test extends TestCase
 {
     /**
      * @expectedException Issue244Exception

diff --git a/tests/Regression/GitHub/322/Issue322Test.php b/tests/Regression/GitHub/322/Issue322Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue322Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue322Test extends TestCase
 {
     /**
      * @group one

diff --git a/tests/Regression/GitHub/433/Issue433Test.php b/tests/Regression/GitHub/433/Issue433Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue433Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue433Test extends TestCase
 {
     public function testOutputWithExpectationBefore()
     {

diff --git a/tests/Regression/GitHub/445/Issue445Test.php b/tests/Regression/GitHub/445/Issue445Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue445Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue445Test extends TestCase
 {
     public function testOutputWithExpectationBefore()
     {

diff --git a/tests/Regression/GitHub/498/Issue498Test.php b/tests/Regression/GitHub/498/Issue498Test.php
@@ -1,6 +1,8 @@
 <?php
 
-class Issue498Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue498Test extends TestCase
 {
     /**
      * @test

diff --git a/tests/Regression/GitHub/503/Issue503Test.php b/tests/Regression/GitHub/503/Issue503Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue503Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue503Test extends TestCase
 {
     public function testCompareDifferentLineEndings()
     {

diff --git a/tests/Regression/GitHub/581/Issue581Test.php b/tests/Regression/GitHub/581/Issue581Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue581Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue581Test extends TestCase
 {
     public function testExportingObjectsDoesNotBreakWindowsLineFeeds()
     {

diff --git a/tests/Regression/GitHub/74.phpt b/tests/Regression/GitHub/74.phpt
@@ -22,7 +22,7 @@ There was 1 error:
 1) Issue74Test::testCreateAndThrowNewExceptionInProcessIsolation
 NewException: Testing GH-74
 
-%sIssue74Test.php:7
+%sIssue74Test.php:%d
 
 ERRORS!
 Tests: 1, Assertions: 0, Errors: 1.
diff --git a/tests/Regression/GitHub/74/Issue74Test.php b/tests/Regression/GitHub/74/Issue74Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue74Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue74Test extends TestCase
 {
     public function testCreateAndThrowNewExceptionInProcessIsolation()
     {

diff --git a/tests/Regression/GitHub/765/Issue765Test.php b/tests/Regression/GitHub/765/Issue765Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue765Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue765Test extends TestCase
 {
     public function testDependee()
     {

diff --git a/tests/Regression/GitHub/797/Issue797Test.php b/tests/Regression/GitHub/797/Issue797Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue797Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue797Test extends TestCase
 {
     protected $preserveGlobalState = false;
 

diff --git a/tests/Regression/Trac/1021/Issue1021Test.php b/tests/Regression/Trac/1021/Issue1021Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue1021Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue1021Test extends TestCase
 {
     /**
      * @dataProvider provider

diff --git a/tests/Regression/Trac/523/Issue523Test.php b/tests/Regression/Trac/523/Issue523Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue523Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue523Test extends TestCase
 {
     public function testAttributeEquals()
     {

diff --git a/tests/Regression/Trac/578/Issue578Test.php b/tests/Regression/Trac/578/Issue578Test.php
@@ -1,5 +1,7 @@
 <?php
-class Issue578Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Issue578Test extends TestCase
 {
     public function testNoticesDoublePrintStackTrace()
     {

diff --git a/tests/Regression/Trac/684/Issue684Test.php b/tests/Regression/Trac/684/Issue684Test.php
@@ -1,4 +1,6 @@
 <?php
-class Foo_Bar_Issue684Test extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Foo_Bar_Issue684Test extends TestCase
 {
 }
diff --git a/tests/Regression/Trac/783/OneTest.php b/tests/Regression/Trac/783/OneTest.php
@@ -1,8 +1,10 @@
 <?php
+use PHPUnit\Framework\TestCase;
+
 /**
  * @group foo
  */
-class OneTest extends PHPUnit_Framework_TestCase
+class OneTest extends TestCase
 {
     public function testSomething()
     {

diff --git a/tests/Regression/Trac/783/TwoTest.php b/tests/Regression/Trac/783/TwoTest.php
@@ -1,8 +1,10 @@
 <?php
+use PHPUnit\Framework\TestCase;
+
 /**
  * @group bar
  */
-class TwoTest extends PHPUnit_Framework_TestCase
+class TwoTest extends TestCase
 {
     public function testSomething()
     {

diff --git a/tests/Runner/PhptTestCaseTest.php b/tests/Runner/PhptTestCaseTest.php
@@ -8,7 +8,9 @@
  * file that was distributed with this source code.
  */
 
-class Runner_PhptTestCaseTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Runner_PhptTestCaseTest extends TestCase
 {
     const EXPECT_CONTENT = <<<EOF
 --TEST--

diff --git a/tests/TextUI/failure-reverse-list.phpt b/tests/TextUI/failure-reverse-list.phpt
@@ -116,7 +116,7 @@ Failed asserting that two objects are equal.
 +    'bar' => 'foo'
  )
 
-%s:22
+%s:%d
 
 12) FailureTest::testAssertIntegerEqualsInteger
 message

diff --git a/tests/TextUI/log-xml.phpt b/tests/TextUI/log-xml.phpt
@@ -16,9 +16,9 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 ...                                                                 3 / 3 (100%)<?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
   <testsuite name="BankAccountTest" file="%sBankAccountTest.php" tests="3" assertions="3" errors="0" failures="0" skipped="0" time="%f">
-    <testcase name="testBalanceIsInitiallyZero" class="BankAccountTest" file="%sBankAccountTest.php" line="30" assertions="1" time="%f"/>
-    <testcase name="testBalanceCannotBecomeNegative" class="BankAccountTest" file="%sBankAccountTest.php" line="47" assertions="1" time="%f"/>
-    <testcase name="testBalanceCannotBecomeNegative2" class="BankAccountTest" file="%sBankAccountTest.php" line="65" assertions="1" time="%f"/>
+    <testcase name="testBalanceIsInitiallyZero" class="BankAccountTest" file="%sBankAccountTest.php" line="%d" assertions="1" time="%f"/>
+    <testcase name="testBalanceCannotBecomeNegative" class="BankAccountTest" file="%sBankAccountTest.php" line="%d" assertions="1" time="%f"/>
+    <testcase name="testBalanceCannotBecomeNegative2" class="BankAccountTest" file="%sBankAccountTest.php" line="%d" assertions="1" time="%f"/>
   </testsuite>
 </testsuites>
 

diff --git a/tests/TextUI/testdox-xml.phpt b/tests/TextUI/testdox-xml.phpt
@@ -15,7 +15,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 ...                                                                 3 / 3 (100%)<?xml version="1.0" encoding="UTF-8"?>
 <tests>
-  <test className="BankAccountTest" methodName="testBalanceIsInitiallyZero" prettifiedClassName="BankAccount" prettifiedMethodName="Balance is initially zero" status="0" time="%f" size="-1" groups="balanceIsInitiallyZero,specification" given="a fresh bank account" givenStartLine="32" when="I ask it for its balance" whenStartLine="35" then="I should get 0" thenStartLine="38"/>
+  <test className="BankAccountTest" methodName="testBalanceIsInitiallyZero" prettifiedClassName="BankAccount" prettifiedMethodName="Balance is initially zero" status="0" time="%f" size="-1" groups="balanceIsInitiallyZero,specification" given="a fresh bank account" givenStartLine="33" when="I ask it for its balance" whenStartLine="36" then="I should get 0" thenStartLine="39"/>
   <test className="BankAccountTest" methodName="testBalanceCannotBecomeNegative" prettifiedClassName="BankAccount" prettifiedMethodName="Balance cannot become negative" status="0" time="%f" size="-1" groups="balanceCannotBecomeNegative,specification"/>
   <test className="BankAccountTest" methodName="testBalanceCannotBecomeNegative2" prettifiedClassName="BankAccount" prettifiedMethodName="Balance cannot become negative" status="0" time="%f" size="-1" groups="balanceCannotBecomeNegative,specification"/>
 </tests>

diff --git a/tests/Util/ConfigurationTest.php b/tests/Util/ConfigurationTest.php
@@ -8,7 +8,9 @@
  * file that was distributed with this source code.
  */
 
-class Util_ConfigurationTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Util_ConfigurationTest extends TestCase
 {
     /**
      * @var PHPUnit_Util_Configuration

diff --git a/tests/Util/GetoptTest.php b/tests/Util/GetoptTest.php
@@ -7,10 +7,11 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+use PHPUnit\Framework\TestCase;
 
 /**
  */
-class Util_GetoptTest extends PHPUnit_Framework_TestCase
+class Util_GetoptTest extends TestCase
 {
     public function testItIncludeTheLongOptionsAfterTheArgument()
     {

diff --git a/tests/Util/GlobalStateTest.php b/tests/Util/GlobalStateTest.php
@@ -7,10 +7,11 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+use PHPUnit\Framework\TestCase;
 
 /**
  */
-class Util_GlobalStateTest extends PHPUnit_Framework_TestCase
+class Util_GlobalStateTest extends TestCase
 {
     /**
      * @covers PHPUnit_Util_GlobalState::processIncludedFilesAsString

diff --git a/tests/Util/PHPTest.php b/tests/Util/PHPTest.php
@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author     Henrique Moody <henriquemoody@gmail.com>
@@ -16,7 +17,7 @@
  * @link       http://www.phpunit.de/
  * @covers     PHPUnit_Util_PHP
  */
-class PHPUnit_Util_PHPTest extends PHPUnit_Framework_TestCase
+class PHPUnit_Util_PHPTest extends TestCase
 {
     public function testShouldNotUseStderrRedirectionByDefault()
     {

diff --git a/tests/Util/RegexTest.php b/tests/Util/RegexTest.php
@@ -7,11 +7,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+use PHPUnit\Framework\TestCase;
 
 /**
  * @since      Class available since Release 4.2.0
  */
-class Util_RegexTest extends PHPUnit_Framework_TestCase
+class Util_RegexTest extends TestCase
 {
     public function validRegexpProvider()
     {

diff --git a/tests/Util/TestDox/NamePrettifierTest.php b/tests/Util/TestDox/NamePrettifierTest.php
@@ -7,11 +7,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+use PHPUnit\Framework\TestCase;
 
 /**
  * @since      Class available since Release 2.1.0
  */
-class Util_TestDox_NamePrettifierTest extends PHPUnit_Framework_TestCase
+class Util_TestDox_NamePrettifierTest extends TestCase
 {
     protected $namePrettifier;
 

diff --git a/tests/Util/TestTest.php b/tests/Util/TestTest.php
@@ -10,6 +10,7 @@
 
 use PHPUnit\Framework\CodeCoverageException;
 use PHPUnit\Framework\Exception;
+use PHPUnit\Framework\TestCase;
 
 if (!defined('TEST_FILES_PATH')) {
     define(
@@ -25,7 +26,7 @@
 /**
  * @since      Class available since Release 3.3.6
  */
-class Util_TestTest extends PHPUnit_Framework_TestCase
+class Util_TestTest extends TestCase
 {
     /**
      * @covers PHPUnit_Util_Test::getExpectedException

diff --git a/tests/Util/XMLTest.php b/tests/Util/XMLTest.php
@@ -8,12 +8,13 @@
  * file that was distributed with this source code.
  */
 use PHPUnit\Framework\Exception;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @since      Class available since Release 3.3.0
  * @covers     PHPUnit_Util_XML
  */
-class Util_XMLTest extends PHPUnit_Framework_TestCase
+class Util_XMLTest extends TestCase
 {
     /**
      * @dataProvider charProvider

diff --git a/tests/_files/AbstractTest.php b/tests/_files/AbstractTest.php
@@ -1,5 +1,7 @@
 <?php
-abstract class AbstractTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+abstract class AbstractTest extends TestCase
 {
     public function testOne()
     {

diff --git a/tests/_files/AssertionExampleTest.php b/tests/_files/AssertionExampleTest.php
@@ -1,5 +1,7 @@
 <?php
-class AssertionExampleTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class AssertionExampleTest extends TestCase
 {
     public function testOne()
     {

diff --git a/tests/_files/BankAccountTest.php b/tests/_files/BankAccountTest.php
@@ -7,13 +7,14 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for the BankAccount class.
  *
  * @since      Class available since Release 2.3.0
  */
-class BankAccountTest extends PHPUnit_Framework_TestCase
+class BankAccountTest extends TestCase
 {
     protected $ba;
 

diff --git a/tests/_files/BankAccountTest.test.php b/tests/_files/BankAccountTest.test.php
@@ -7,13 +7,14 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for the BankAccount class.
  *
  * @since      Class available since Release 2.3.0
  */
-class BankAccountWithCustomExtensionTest extends PHPUnit_Framework_TestCase
+class BankAccountWithCustomExtensionTest extends TestCase
 {
     protected $ba;
 

diff --git a/tests/_files/BeforeAndAfterTest.php b/tests/_files/BeforeAndAfterTest.php
@@ -1,5 +1,7 @@
 <?php
-class BeforeAndAfterTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class BeforeAndAfterTest extends TestCase
 {
     public static $beforeWasRun;
     public static $afterWasRun;

diff --git a/tests/_files/BeforeClassAndAfterClassTest.php b/tests/_files/BeforeClassAndAfterClassTest.php
@@ -1,5 +1,7 @@
 <?php
-class BeforeClassAndAfterClassTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class BeforeClassAndAfterClassTest extends TestCase
 {
     public static $beforeClassWasRun = 0;
     public static $afterClassWasRun  = 0;

diff --git a/tests/_files/BeforeClassWithOnlyDataProviderTest.php b/tests/_files/BeforeClassWithOnlyDataProviderTest.php
@@ -1,5 +1,5 @@
 <?php
-class BeforeClassWithOnlyDataProviderTest extends \PHPUnit_Framework_TestCase
+class BeforeClassWithOnlyDataProviderTest extends \PHPUnit\Framework\TestCase
 {
     public static $setUpBeforeClassWasCalled;
     public static $beforeClassWasCalled;

diff --git a/tests/_files/ChangeCurrentWorkingDirectoryTest.php b/tests/_files/ChangeCurrentWorkingDirectoryTest.php
@@ -1,5 +1,7 @@
 <?php
-class ChangeCurrentWorkingDirectoryTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ChangeCurrentWorkingDirectoryTest extends TestCase
 {
     public function testSomethingThatChangesTheCwd()
     {

diff --git a/tests/_files/ClonedDependencyTest.php b/tests/_files/ClonedDependencyTest.php
@@ -1,5 +1,7 @@
 <?php
-class ClonedDependencyTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ClonedDependencyTest extends TestCase
 {
     private static $dependency;
 

diff --git a/tests/_files/CoverageClassExtendedTest.php b/tests/_files/CoverageClassExtendedTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageClassExtendedTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageClassExtendedTest extends TestCase
 {
     /**
      * @covers CoveredClass<extended>

diff --git a/tests/_files/CoverageClassTest.php b/tests/_files/CoverageClassTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageClassTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageClassTest extends TestCase
 {
     /**
      * @covers CoveredClass

diff --git a/tests/_files/CoverageFunctionParenthesesTest.php b/tests/_files/CoverageFunctionParenthesesTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageFunctionParenthesesTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageFunctionParenthesesTest extends TestCase
 {
     /**
      * @covers ::globalFunction()

diff --git a/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php b/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageFunctionParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageFunctionParenthesesWhitespaceTest extends TestCase
 {
     /**
      * @covers ::globalFunction ( )

diff --git a/tests/_files/CoverageFunctionTest.php b/tests/_files/CoverageFunctionTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageFunctionTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageFunctionTest extends TestCase
 {
     /**
      * @covers ::globalFunction

diff --git a/tests/_files/CoverageMethodOneLineAnnotationTest.php b/tests/_files/CoverageMethodOneLineAnnotationTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class CoverageMethodOneLineAnnotationTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageMethodOneLineAnnotationTest extends TestCase
 {
     /** @covers CoveredClass::publicMethod */
     public function testSomething()

diff --git a/tests/_files/CoverageMethodParenthesesTest.php b/tests/_files/CoverageMethodParenthesesTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageMethodParenthesesTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageMethodParenthesesTest extends TestCase
 {
     /**
      * @covers CoveredClass::publicMethod()

diff --git a/tests/_files/CoverageMethodParenthesesWhitespaceTest.php b/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageMethodParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageMethodParenthesesWhitespaceTest extends TestCase
 {
     /**
      * @covers CoveredClass::publicMethod ( )

diff --git a/tests/_files/CoverageMethodTest.php b/tests/_files/CoverageMethodTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageMethodTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageMethodTest extends TestCase
 {
     /**
      * @covers CoveredClass::publicMethod

diff --git a/tests/_files/CoverageNamespacedFunctionTest.php b/tests/_files/CoverageNamespacedFunctionTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageNamespacedFunctionTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageNamespacedFunctionTest extends TestCase
 {
     /**
      * @covers foo\func()

diff --git a/tests/_files/CoverageNoneTest.php b/tests/_files/CoverageNoneTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageNoneTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageNoneTest extends TestCase
 {
     public function testSomething()
     {

diff --git a/tests/_files/CoverageNotPrivateTest.php b/tests/_files/CoverageNotPrivateTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageNotPrivateTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageNotPrivateTest extends TestCase
 {
     /**
      * @covers CoveredClass::<!private>

diff --git a/tests/_files/CoverageNotProtectedTest.php b/tests/_files/CoverageNotProtectedTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageNotProtectedTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageNotProtectedTest extends TestCase
 {
     /**
      * @covers CoveredClass::<!protected>

diff --git a/tests/_files/CoverageNotPublicTest.php b/tests/_files/CoverageNotPublicTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageNotPublicTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageNotPublicTest extends TestCase
 {
     /**
      * @covers CoveredClass::<!public>

diff --git a/tests/_files/CoverageNothingTest.php b/tests/_files/CoverageNothingTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageNothingTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageNothingTest extends TestCase
 {
     /**
      * @covers CoveredClass::publicMethod

diff --git a/tests/_files/CoveragePrivateTest.php b/tests/_files/CoveragePrivateTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoveragePrivateTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoveragePrivateTest extends TestCase
 {
     /**
      * @covers CoveredClass::<private>

diff --git a/tests/_files/CoverageProtectedTest.php b/tests/_files/CoverageProtectedTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoverageProtectedTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoverageProtectedTest extends TestCase
 {
     /**
      * @covers CoveredClass::<protected>

diff --git a/tests/_files/CoveragePublicTest.php b/tests/_files/CoveragePublicTest.php
@@ -1,5 +1,7 @@
 <?php
-class CoveragePublicTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class CoveragePublicTest extends TestCase
 {
     /**
      * @covers CoveredClass::<public>

diff --git a/tests/_files/DataProviderDebugTest.php b/tests/_files/DataProviderDebugTest.php
@@ -1,5 +1,7 @@
 <?php
-class DataProviderDebugTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class DataProviderDebugTest extends TestCase
 {
     /**
      * @dataProvider provider

diff --git a/tests/_files/DataProviderFilterTest.php b/tests/_files/DataProviderFilterTest.php
@@ -1,5 +1,7 @@
 <?php
-class DataProviderFilterTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class DataProviderFilterTest extends TestCase
 {
     /**
      * @dataProvider truthProvider

diff --git a/tests/_files/DataProviderIncompleteTest.php b/tests/_files/DataProviderIncompleteTest.php
@@ -1,5 +1,7 @@
 <?php
-class DataProviderIncompleteTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class DataProviderIncompleteTest extends TestCase
 {
     /**
      * @dataProvider incompleteTestProviderMethod

diff --git a/tests/_files/DataProviderSkippedTest.php b/tests/_files/DataProviderSkippedTest.php
@@ -1,5 +1,7 @@
 <?php
-class DataProviderSkippedTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class DataProviderSkippedTest extends TestCase
 {
     /**
      * @dataProvider skippedTestProviderMethod

diff --git a/tests/_files/DataProviderTest.php b/tests/_files/DataProviderTest.php
@@ -1,5 +1,7 @@
 <?php
-class DataProviderTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class DataProviderTest extends TestCase
 {
     /**
      * @dataProvider providerMethod

diff --git a/tests/_files/DataProviderTestDoxTest.php b/tests/_files/DataProviderTestDoxTest.php
@@ -1,5 +1,7 @@
 <?php
-class DataProviderTestDoxTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class DataProviderTestDoxTest extends TestCase
 {
     /**
      * @dataProvider provider

diff --git a/tests/_files/DependencyFailureTest.php b/tests/_files/DependencyFailureTest.php
@@ -1,5 +1,7 @@
 <?php
-class DependencyFailureTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class DependencyFailureTest extends TestCase
 {
     public function testOne()
     {

diff --git a/tests/_files/DependencySuccessTest.php b/tests/_files/DependencySuccessTest.php
@@ -1,5 +1,7 @@
 <?php
-class DependencySuccessTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class DependencySuccessTest extends TestCase
 {
     public function testOne()
     {

diff --git a/tests/_files/DoubleTestCase.php b/tests/_files/DoubleTestCase.php
@@ -1,11 +1,12 @@
 <?php
+use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Test;
 
 class DoubleTestCase implements Test
 {
     protected $testCase;
 
-    public function __construct(PHPUnit_Framework_TestCase $testCase)
+    public function __construct(TestCase $testCase)
     {
         $this->testCase = $testCase;
     }

diff --git a/tests/_files/EmptyTestCaseTest.php b/tests/_files/EmptyTestCaseTest.php
@@ -1,4 +1,6 @@
 <?php
-class EmptyTestCaseTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class EmptyTestCaseTest extends TestCase
 {
 }
diff --git a/tests/_files/ExceptionInAssertPostConditionsTest.php b/tests/_files/ExceptionInAssertPostConditionsTest.php
@@ -1,5 +1,7 @@
 <?php
-class ExceptionInAssertPostConditionsTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ExceptionInAssertPostConditionsTest extends TestCase
 {
     public $setUp                = false;
     public $assertPreConditions  = false;

diff --git a/tests/_files/ExceptionInAssertPreConditionsTest.php b/tests/_files/ExceptionInAssertPreConditionsTest.php
@@ -1,5 +1,7 @@
 <?php
-class ExceptionInAssertPreConditionsTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ExceptionInAssertPreConditionsTest extends TestCase
 {
     public $setUp                = false;
     public $assertPreConditions  = false;

diff --git a/tests/_files/ExceptionInSetUpTest.php b/tests/_files/ExceptionInSetUpTest.php
@@ -1,5 +1,7 @@
 <?php
-class ExceptionInSetUpTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ExceptionInSetUpTest extends TestCase
 {
     public $setUp                = false;
     public $assertPreConditions  = false;

diff --git a/tests/_files/ExceptionInTearDownTest.php b/tests/_files/ExceptionInTearDownTest.php
@@ -1,5 +1,7 @@
 <?php
-class ExceptionInTearDownTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ExceptionInTearDownTest extends TestCase
 {
     public $setUp                = false;
     public $assertPreConditions  = false;

diff --git a/tests/_files/ExceptionInTest.php b/tests/_files/ExceptionInTest.php
@@ -1,5 +1,7 @@
 <?php
-class ExceptionInTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ExceptionInTest extends TestCase
 {
     public $setUp                = false;
     public $assertPreConditions  = false;

diff --git a/tests/_files/ExceptionNamespaceTest.php b/tests/_files/ExceptionNamespaceTest.php
@@ -2,7 +2,7 @@
 
 namespace My\Space;
 
-class ExceptionNamespaceTest extends \PHPUnit_Framework_TestCase
+class ExceptionNamespaceTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Exception message

diff --git a/tests/_files/ExceptionStackTest.php b/tests/_files/ExceptionStackTest.php
@@ -1,7 +1,8 @@
 <?php
 use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\TestCase;
 
-class ExceptionStackTest extends PHPUnit_Framework_TestCase
+class ExceptionStackTest extends TestCase
 {
     public function testPrintingChildException()
     {

diff --git a/tests/_files/ExceptionTest.php b/tests/_files/ExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
-class ExceptionTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ExceptionTest extends TestCase
 {
     /**
      * Exception message

diff --git a/tests/_files/Failure.php b/tests/_files/Failure.php
@@ -1,5 +1,7 @@
 <?php
-class Failure extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Failure extends TestCase
 {
     protected function runTest()
     {

diff --git a/tests/_files/FailureTest.php b/tests/_files/FailureTest.php
@@ -1,5 +1,7 @@
 <?php
-class FailureTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class FailureTest extends TestCase
 {
     public function testAssertArrayEqualsArray()
     {

diff --git a/tests/_files/FatalTest.php b/tests/_files/FatalTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class FatalTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class FatalTest extends TestCase
 {
     public function testFatalError()
     {

diff --git a/tests/_files/IgnoreCodeCoverageClassTest.php b/tests/_files/IgnoreCodeCoverageClassTest.php
@@ -1,5 +1,7 @@
 <?php
-class IgnoreCodeCoverageClassTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class IgnoreCodeCoverageClassTest extends TestCase
 {
     public function testReturnTrue()
     {

diff --git a/tests/_files/IncompleteTest.php b/tests/_files/IncompleteTest.php
@@ -1,5 +1,7 @@
 <?php
-class IncompleteTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class IncompleteTest extends TestCase
 {
     public function testIncomplete()
     {

diff --git a/tests/_files/Inheritance/InheritanceB.php b/tests/_files/Inheritance/InheritanceB.php
@@ -1,6 +1,8 @@
 <?php
 
-class InheritanceB extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class InheritanceB extends TestCase
 {
     public function testSomething()
     {

diff --git a/tests/_files/IniTest.php b/tests/_files/IniTest.php
@@ -1,5 +1,7 @@
 <?php
-class IniTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class IniTest extends TestCase
 {
     public function testIni()
     {

diff --git a/tests/_files/IsolationTest.php b/tests/_files/IsolationTest.php
@@ -1,5 +1,7 @@
 <?php
-class IsolationTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class IsolationTest extends TestCase
 {
     public function testIsInIsolationReturnsFalse()
     {

diff --git a/tests/_files/MultiDependencyTest.php b/tests/_files/MultiDependencyTest.php
@@ -1,5 +1,7 @@
 <?php
-class MultiDependencyTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class MultiDependencyTest extends TestCase
 {
     public function testOne()
     {

diff --git a/tests/_files/MultipleDataProviderTest.php b/tests/_files/MultipleDataProviderTest.php
@@ -1,5 +1,7 @@
 <?php
-class MultipleDataProviderTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class MultipleDataProviderTest extends TestCase
 {
     /**
      * @dataProvider providerA

diff --git a/tests/_files/NamespaceCoverageClassExtendedTest.php b/tests/_files/NamespaceCoverageClassExtendedTest.php
@@ -1,5 +1,7 @@
 <?php
-class NamespaceCoverageClassExtendedTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NamespaceCoverageClassExtendedTest extends TestCase
 {
     /**
      * @covers Foo\CoveredClass<extended>

diff --git a/tests/_files/NamespaceCoverageClassTest.php b/tests/_files/NamespaceCoverageClassTest.php
@@ -1,5 +1,7 @@
 <?php
-class NamespaceCoverageClassTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NamespaceCoverageClassTest extends TestCase
 {
     /**
      * @covers Foo\CoveredClass

diff --git a/tests/_files/NamespaceCoverageCoversClassPublicTest.php b/tests/_files/NamespaceCoverageCoversClassPublicTest.php
@@ -1,8 +1,10 @@
 <?php
+use PHPUnit\Framework\TestCase;
+
 /**
  * @coversDefaultClass \Foo\CoveredClass
  */
-class NamespaceCoverageCoversClassPublicTest extends PHPUnit_Framework_TestCase
+class NamespaceCoverageCoversClassPublicTest extends TestCase
 {
     /**
      * @covers ::publicMethod

diff --git a/tests/_files/NamespaceCoverageCoversClassTest.php b/tests/_files/NamespaceCoverageCoversClassTest.php
@@ -1,8 +1,10 @@
 <?php
+use PHPUnit\Framework\TestCase;
+
 /**
  * @coversDefaultClass \Foo\CoveredClass
  */
-class NamespaceCoverageCoversClassTest extends PHPUnit_Framework_TestCase
+class NamespaceCoverageCoversClassTest extends TestCase
 {
     /**
      * @covers ::privateMethod

diff --git a/tests/_files/NamespaceCoverageMethodTest.php b/tests/_files/NamespaceCoverageMethodTest.php
@@ -1,5 +1,7 @@
 <?php
-class NamespaceCoverageMethodTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NamespaceCoverageMethodTest extends TestCase
 {
     /**
      * @covers Foo\CoveredClass::publicMethod

diff --git a/tests/_files/NamespaceCoverageNotPrivateTest.php b/tests/_files/NamespaceCoverageNotPrivateTest.php
@@ -1,5 +1,7 @@
 <?php
-class NamespaceCoverageNotPrivateTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NamespaceCoverageNotPrivateTest extends TestCase
 {
     /**
      * @covers Foo\CoveredClass::<!private>

diff --git a/tests/_files/NamespaceCoverageNotProtectedTest.php b/tests/_files/NamespaceCoverageNotProtectedTest.php
@@ -1,5 +1,7 @@
 <?php
-class NamespaceCoverageNotProtectedTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NamespaceCoverageNotProtectedTest extends TestCase
 {
     /**
      * @covers Foo\CoveredClass::<!protected>

diff --git a/tests/_files/NamespaceCoverageNotPublicTest.php b/tests/_files/NamespaceCoverageNotPublicTest.php
@@ -1,5 +1,7 @@
 <?php
-class NamespaceCoverageNotPublicTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NamespaceCoverageNotPublicTest extends TestCase
 {
     /**
      * @covers Foo\CoveredClass::<!public>

diff --git a/tests/_files/NamespaceCoveragePrivateTest.php b/tests/_files/NamespaceCoveragePrivateTest.php
@@ -1,5 +1,7 @@
 <?php
-class NamespaceCoveragePrivateTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NamespaceCoveragePrivateTest extends TestCase
 {
     /**
      * @covers Foo\CoveredClass::<private>

diff --git a/tests/_files/NamespaceCoverageProtectedTest.php b/tests/_files/NamespaceCoverageProtectedTest.php
@@ -1,5 +1,7 @@
 <?php
-class NamespaceCoverageProtectedTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NamespaceCoverageProtectedTest extends TestCase
 {
     /**
      * @covers Foo\CoveredClass::<protected>

diff --git a/tests/_files/NamespaceCoveragePublicTest.php b/tests/_files/NamespaceCoveragePublicTest.php
@@ -1,5 +1,7 @@
 <?php
-class NamespaceCoveragePublicTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NamespaceCoveragePublicTest extends TestCase
 {
     /**
      * @covers Foo\CoveredClass::<public>

diff --git a/tests/_files/NoArgTestCaseTest.php b/tests/_files/NoArgTestCaseTest.php
@@ -1,5 +1,7 @@
 <?php
-class NoArgTestCaseTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NoArgTestCaseTest extends TestCase
 {
     public function testNothing()
     {

diff --git a/tests/_files/NoTestCases.php b/tests/_files/NoTestCases.php
@@ -1,5 +1,7 @@
 <?php
-class NoTestCases extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NoTestCases extends TestCase
 {
     public function noTestCase()
     {

diff --git a/tests/_files/NotExistingCoveredElementTest.php b/tests/_files/NotExistingCoveredElementTest.php
@@ -1,5 +1,7 @@
 <?php
-class NotExistingCoveredElementTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NotExistingCoveredElementTest extends TestCase
 {
     /**
      * @covers NotExistingClass

diff --git a/tests/_files/NotPublicTestCase.php b/tests/_files/NotPublicTestCase.php
@@ -1,5 +1,7 @@
 <?php
-class NotPublicTestCase extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NotPublicTestCase extends TestCase
 {
     public function testPublic()
     {

diff --git a/tests/_files/NotVoidTestCase.php b/tests/_files/NotVoidTestCase.php
@@ -1,4 +1,6 @@
 <?php
-class NotVoidTestCase extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NotVoidTestCase extends TestCase
 {
 }
diff --git a/tests/_files/NothingTest.php b/tests/_files/NothingTest.php
@@ -1,5 +1,7 @@
 <?php
-class NothingTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class NothingTest extends TestCase
 {
     public function testNothing()
     {

diff --git a/tests/_files/OneTestCase.php b/tests/_files/OneTestCase.php
@@ -1,5 +1,7 @@
 <?php
-class OneTestCase extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class OneTestCase extends TestCase
 {
     public function noTestCase()
     {

diff --git a/tests/_files/OutputTestCase.php b/tests/_files/OutputTestCase.php
@@ -1,5 +1,7 @@
 <?php
-class OutputTestCase extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class OutputTestCase extends TestCase
 {
     public function testExpectOutputStringFooActualFoo()
     {

diff --git a/tests/_files/RequirementsClassBeforeClassHookTest.php b/tests/_files/RequirementsClassBeforeClassHookTest.php
@@ -1,9 +1,10 @@
 <?php
+use PHPUnit\Framework\TestCase;
 
 /**
  * @requires extension nonExistingExtension
  */
-class RequirementsClassBeforeClassHookTest extends PHPUnit_Framework_TestCase
+class RequirementsClassBeforeClassHookTest extends TestCase
 {
     public static function setUpBeforeClass()
     {

diff --git a/tests/_files/RequirementsTest.php b/tests/_files/RequirementsTest.php
@@ -1,5 +1,7 @@
 <?php
-class RequirementsTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class RequirementsTest extends TestCase
 {
     public function testOne()
     {

diff --git a/tests/_files/StackTest.php b/tests/_files/StackTest.php
@@ -1,5 +1,7 @@
 <?php
-class StackTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class StackTest extends TestCase
 {
     public function testPush()
     {

diff --git a/tests/_files/StopsOnWarningTest.php b/tests/_files/StopsOnWarningTest.php
@@ -1,5 +1,7 @@
 <?php
-class StopsOnWarningTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class StopsOnWarningTest extends TestCase
 {
     public function testOne()
     {

diff --git a/tests/_files/Success.php b/tests/_files/Success.php
@@ -1,5 +1,7 @@
 <?php
-class Success extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class Success extends TestCase
 {
     protected function runTest()
     {

diff --git a/tests/_files/TemplateMethodsTest.php b/tests/_files/TemplateMethodsTest.php
@@ -1,5 +1,7 @@
 <?php
-class TemplateMethodsTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TemplateMethodsTest extends TestCase
 {
     public static function setUpBeforeClass()
     {

diff --git a/tests/_files/TestDoxGroupTest.php b/tests/_files/TestDoxGroupTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class TestDoxGroupTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TestDoxGroupTest extends TestCase
 {
     /**
      * @group one

diff --git a/tests/_files/TestIncomplete.php b/tests/_files/TestIncomplete.php
@@ -1,5 +1,7 @@
 <?php
-class TestIncomplete extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TestIncomplete extends TestCase
 {
     protected function runTest()
     {

diff --git a/tests/_files/TestSkipped.php b/tests/_files/TestSkipped.php
@@ -1,5 +1,7 @@
 <?php
-class TestSkipped extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TestSkipped extends TestCase
 {
     protected function runTest()
     {

diff --git a/tests/_files/TestTestError.php b/tests/_files/TestTestError.php
@@ -1,5 +1,7 @@
 <?php
-class TestError extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TestError extends TestCase
 {
     protected function runTest()
     {

diff --git a/tests/_files/TestWithTest.php b/tests/_files/TestWithTest.php
@@ -1,5 +1,7 @@
 <?php
-class TestWithTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TestWithTest extends TestCase
 {
     /**
      * @testWith [0, 0, 0]

diff --git a/tests/_files/ThrowExceptionTestCase.php b/tests/_files/ThrowExceptionTestCase.php
@@ -1,5 +1,7 @@
 <?php
-class ThrowExceptionTestCase extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ThrowExceptionTestCase extends TestCase
 {
     public function test()
     {

diff --git a/tests/_files/ThrowNoExceptionTestCase.php b/tests/_files/ThrowNoExceptionTestCase.php
@@ -1,5 +1,7 @@
 <?php
-class ThrowNoExceptionTestCase extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ThrowNoExceptionTestCase extends TestCase
 {
     public function test()
     {

diff --git a/tests/_files/WasRun.php b/tests/_files/WasRun.php
@@ -1,5 +1,7 @@
 <?php
-class WasRun extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class WasRun extends TestCase
 {
     public $wasRun = false;
 

diff --git a/tests/_files/phpunit-example-extension/tests/OneTest.php b/tests/_files/phpunit-example-extension/tests/OneTest.php
@@ -1,7 +1,8 @@
 <?php
 use PHPUnit\ExampleExtension\TestCaseTrait;
+use PHPUnit\Framework\TestCase;
 
-class OneTest extends PHPUnit_Framework_TestCase
+class OneTest extends TestCase
 {
     use TestCaseTrait;
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,7 +116,7 @@ Failed asserting that two objects are equal. @@
     +    'bar' => 'foo'
      )
-    %s:22
+    %s:%d
 ) FailureTest::testAssertIntegerEqualsInteger
     message
@@ Expand Down @@