diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormBase.php b/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormBase.php
index f6f2e1b..7a4ffd0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormBase.php
@@ -19,9 +19,9 @@
   /**
    * Form ID to use for testing.
    *
-   * @var string
+   * @var \Drupal\Core\Form\FormInterface.
    */
-  protected $form_id;
+  protected $form;
 
   /**
    * Values to use for testing.
@@ -45,13 +45,13 @@
   /**
    * Submit the system_config_form ensure the configuration has expected values.
    */
-  function testConfigForm() {
+  public function testConfigForm() {
     // Programmatically submit the given values.
     foreach ($this->values as $form_key => $data) {
       $values[$form_key] = $data['#value'];
     }
     $form_state = array('values' => $values);
-    drupal_form_submit($this->form_id, $form_state);
+    drupal_form_submit($this->form->getFormID(), $form_state);
 
     // Check that the form returns an error when expected, and vice versa.
     $errors = form_get_errors();
@@ -62,7 +62,7 @@ function testConfigForm() {
     );
     $this->assertTrue($valid_form, format_string('Input values: %values<br/>Validation handler errors: %errors', $args));
 
-    foreach ($this->values as $form_key => $data) {
+    foreach ($this->values as $data) {
       $this->assertEqual($data['#value'], config($data['#config_name'])->get($data['#config_key']));
     }
   }
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php b/core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php
index 89916ed..dc3b64c 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php
@@ -23,7 +23,7 @@ public static function getInfo() {
   public function setUp() {
     parent::setUp();
 
-    $this->form_id = AccountSettingsForm::create($this->container);
+    $this->form = AccountSettingsForm::create($this->container);
     $this->values = array(
       'anonymous' => array(
         '#value' => $this->randomString(10),
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 34a26f9..6167c39 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1002,10 +1002,8 @@ function user_menu() {
   $items['admin/config/people/accounts'] = array(
     'title' => 'Account settings',
     'description' => 'Configure default behavior of users, including registration requirements, e-mails, and fields.',
-    'page callback' => 'NOT_USED',
-    'access arguments' => array('administer users'),
-    'file' => 'user.admin.inc',
     'weight' => -10,
+    'route_name' => 'user_account_settings',
   );
   $items['admin/config/people/accounts/settings'] = array(
     'title' => 'Settings',