diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/Controller/FormTestController.php b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/Controller/FormTestController.php
index 14b398f..08b2998 100644
--- a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/Controller/FormTestController.php
+++ b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/Controller/FormTestController.php
@@ -8,7 +8,7 @@
 
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Language\Language;
-use Drupal\form_test\FormTestHtmlId;
+use Drupal\form_test\Form\FormTestHtmlIdForm;
 
 /**
  * Controller routines for form_test routes.
@@ -43,8 +43,8 @@ public function twoFormInstances() {
    */
   public function twoIdenticalFormInstances() {
     return array(
-      'form1' => drupal_get_form(new \Drupal\form_test\FormTestHtmlId()),
-      'form2' => drupal_get_form(new \Drupal\form_test\FormTestHtmlId()),
+      'form1' => drupal_get_form(new \Drupal\form_test\Form\FormTestHtmlIdForm()),
+      'form2' => drupal_get_form(new \Drupal\form_test\Form\FormTestHtmlIdForm()),
     );
   }
 
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/Form/FormTestHtmlIdForm.php b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/Form/FormTestHtmlIdForm.php
new file mode 100644
index 0000000..a1bcdd8
--- /dev/null
+++ b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/Form/FormTestHtmlIdForm.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\form_test\Form\FormTestHtmlIdForm.
+ */
+
+namespace Drupal\form_test\Form;
+
+use Drupal\Core\Form\FormBase;
+
+/**
+ * Provides a simple form to test duplicate HTML IDs.
+ */
+class FormTestHtmlIdForm extends FormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormID() {
+    return 'form_test_html_id';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, array &$form_state) {
+    $form['name'] = array(
+      '#type' => 'textfield',
+      '#title' => 'name',
+      '#required' => TRUE,
+    );
+    $form['submit'] = array(
+      '#type' => 'submit',
+      '#value' => 'Save',
+    );
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, array &$form_state) {
+  }
+
+}
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestHtmlId.php b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestHtmlId.php
deleted file mode 100644
index 95cadf7..0000000
--- a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestHtmlId.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\form_test\FormTestHtmlId.
- */
-
-namespace Drupal\form_test;
-
-use Drupal\Core\Form\FormBase;
-
-/**
- * Provides a simple form to test duplicate HTML IDs.
- */
-class FormTestHtmlId extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormID() {
-    return 'form_test_html_id';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, array &$form_state) {
-    $form['name'] = array(
-      '#type' => 'textfield',
-      '#title' => 'name',
-      '#required' => TRUE,
-    );
-    $form['submit'] = array(
-      '#type' => 'submit',
-      '#value' => 'Save',
-    );
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, array &$form_state) {
-  }
-
-}