diff --git a/core/tests/TestSuites/FunctionalJavascriptTestSuite.php b/core/tests/TestSuites/FunctionalJavascriptTestSuite.php
index 0a92b35..79ca468 100644
--- a/core/tests/TestSuites/FunctionalJavascriptTestSuite.php
+++ b/core/tests/TestSuites/FunctionalJavascriptTestSuite.php
@@ -12,14 +12,14 @@ class FunctionalJavascriptTestSuite extends TestSuiteBase {
   /**
    * Factory method which loads up a suite with all functional javascript tests.
    *
-   * @return self
+   * @return static
    *   The test suite.
    */
   public static function suite() {
     $root = dirname(dirname(dirname(__DIR__)));
 
-    $suite = new self('functional-javascript');
-    $suite->addSuiteNamespace($root, 'FunctionalJavascript');
+    $suite = new static('functional-javascript');
+    $suite->addTestsBySuiteNamespace($root, 'FunctionalJavascript');
 
     return $suite;
   }
diff --git a/core/tests/TestSuites/FunctionalTestSuite.php b/core/tests/TestSuites/FunctionalTestSuite.php
index cc0c3ca..7e5f264 100644
--- a/core/tests/TestSuites/FunctionalTestSuite.php
+++ b/core/tests/TestSuites/FunctionalTestSuite.php
@@ -12,14 +12,14 @@ class FunctionalTestSuite extends TestSuiteBase {
   /**
    * Factory method which loads up a suite with all unit tests.
    *
-   * @return self
+   * @return static
    *   The test suite.
    */
   public static function suite() {
     $root = dirname(dirname(dirname(__DIR__)));
 
-    $suite = new self('functional');
-    $suite->addSuiteNamespace($root, 'Functional');
+    $suite = new static('functional');
+    $suite->addTestsBySuiteNamespace($root, 'Functional');
 
     return $suite;
   }
diff --git a/core/tests/TestSuites/KernelTestSuite.php b/core/tests/TestSuites/KernelTestSuite.php
index 8205ebf..5eb28cc 100644
--- a/core/tests/TestSuites/KernelTestSuite.php
+++ b/core/tests/TestSuites/KernelTestSuite.php
@@ -12,14 +12,14 @@ class KernelTestSuite extends TestSuiteBase {
   /**
    * Factory method which loads up a suite with all unit tests.
    *
-   * @return self
+   * @return static
    *   The test suite.
    */
   public static function suite() {
     $root = dirname(dirname(dirname(__DIR__)));
 
-    $suite = new self('kernel');
-    $suite->addSuiteNamespace($root, 'Kernel');
+    $suite = new static('kernel');
+    $suite->addTestsBySuiteNamespace($root, 'Kernel');
 
     return $suite;
   }
diff --git a/core/tests/TestSuites/TestSuiteBase.php b/core/tests/TestSuites/TestSuiteBase.php
index ef2d84d..0e87552 100644
--- a/core/tests/TestSuites/TestSuiteBase.php
+++ b/core/tests/TestSuites/TestSuiteBase.php
@@ -31,7 +31,7 @@ public static function findExtensionDirectories() {
    * @param string $suite_namespace
    *   SubNamespace used to separate test suite.
    */
-  protected function addSuiteNamespace($root, $suite_namespace) {
+  protected function addTestsBySuiteNamespace($root, $suite_namespace) {
     // Core's tests are in the namespace Drupal\${suite_namespace}Tests\ and are
     // always inside of core/tests/Drupal/${suite_namespace}Tests. The exception
     // this is Unit tests for historical reasons.
diff --git a/core/tests/TestSuites/UnitTestSuite.php b/core/tests/TestSuites/UnitTestSuite.php
index fa8a2de..b05d455 100644
--- a/core/tests/TestSuites/UnitTestSuite.php
+++ b/core/tests/TestSuites/UnitTestSuite.php
@@ -12,14 +12,14 @@ class UnitTestSuite extends TestSuiteBase {
   /**
    * Factory method which loads up a suite with all unit tests.
    *
-   * @return self
+   * @return static
    *   The test suite.
    */
   public static function suite() {
     $root = dirname(dirname(dirname(__DIR__)));
 
-    $suite = new self('unit');
-    $suite->addSuiteNamespace($root, 'Unit');
+    $suite = new static('unit');
+    $suite->addTestsBySuiteNamespace($root, 'Unit');
 
     return $suite;
   }