diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php
index 39a9b86d61af..11e74a88a563 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php
@@ -7,13 +7,13 @@
 
 namespace Drupal\system\Tests\Form;
 
-use Drupal\system\Tests\System\SystemConfigFormBase;
+use Drupal\system\Tests\System\SystemConfigFormTestBase;
 use Drupal\form_test\FormTestObject;
 
 /**
  * Tests building a form from an object.
  */
-class FormObjectTest extends SystemConfigFormBase {
+class FormObjectTest extends SystemConfigFormTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/SystemConfigFormTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/SystemConfigFormTest.php
index 724544890cfc..56a24c0217ff 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/SystemConfigFormTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/SystemConfigFormTest.php
@@ -11,7 +11,7 @@ use Drupal\simpletest\WebTestBase;
 use Drupal\form_test\SystemConfigFormTestForm;
 
 /**
- * Tests the SystemConfigFormBase class.
+ * Tests the SystemConfigFormTestBase class.
  */
 class SystemConfigFormTest extends WebTestBase {
 
@@ -25,13 +25,13 @@ class SystemConfigFormTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'SystemConfigmForm tests',
-      'description' => 'Tests the SystemConfigFormBase class.',
+      'description' => 'Tests the SystemConfigFormTestBase class.',
       'group' => 'Form API',
     );
   }
 
   /**
-   * Tests the SystemConfigFormBase class.
+   * Tests the SystemConfigFormTestBase class.
    */
   function testSystemConfigForm() {
     $this->drupalGet('form-test/system-config-form');
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormBase.php b/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormTestBase.php
similarity index 92%
rename from core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormBase.php
rename to core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormTestBase.php
index f6f2e1ba7306..69543aa5ec5e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\SystemConfigFormBase.
+ * Definition of Drupal\system\Tests\System\SystemConfigFormTestBase.
  */
 
 namespace Drupal\system\Tests\System;
@@ -15,7 +15,7 @@ use Drupal\simpletest\WebTestBase;
  * @see UserAdminSettingsFormTest
  *   For a full working implementation.
  */
-abstract class SystemConfigFormBase extends WebTestBase {
+abstract class SystemConfigFormTestBase extends WebTestBase {
   /**
    * Form ID to use for testing.
    *
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php b/core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php
index e74a8eaa29ba..28558e6928af 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php
@@ -7,9 +7,9 @@
 
 namespace Drupal\user\Tests;
 
-use Drupal\system\Tests\System\SystemConfigFormBase;
+use Drupal\system\Tests\System\SystemConfigFormTestBase;
 
-class UserAdminSettingsFormTest extends SystemConfigFormBase {
+class UserAdminSettingsFormTest extends SystemConfigFormTestBase {
 
   public static function getInfo() {
     return array(