diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index 48048ad..dbe7aa7 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -11,36 +11,6 @@
 require_once dirname(__FILE__) . '/config_test.hooks.inc';
 
 /**
- * Implements hook_menu().
- */
-function config_test_menu() {
-  $items['admin/structure/config_test'] = array(
-    'title' => 'Test configuration',
-    'route_name' => 'config_test.list_page',
-  );
-  $items['admin/structure/config_test/manage/%config_test'] = array(
-    'route_name' => 'config_test.entity',
-  );
-  $items['admin/structure/config_test/manage/%config_test/edit'] = array(
-    'title' => 'Edit',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
-  $items['admin/structure/config_test/manage/%config_test/delete'] = array(
-    'title' => 'Delete',
-    'route_name' => 'config_test.entity_delete',
-  );
-  $items['admin/structure/config_test/manage/%config_test/enable'] = array(
-    'title' => 'Enable',
-    'route_name' => 'config_test.entity_enable',
-  );
-  $items['admin/structure/config_test/manage/%config_test/disable'] = array(
-    'title' => 'Disable',
-    'route_name' => 'config_test.entity_disable',
-  );
-  return $items;
-}
-
-/**
  * Loads a ConfigTest object.
  *
  * @param string $id
diff --git a/core/modules/config/tests/config_test/config_test.routing.yml b/core/modules/config/tests/config_test/config_test.routing.yml
index 7a2689c..d8864e6 100644
--- a/core/modules/config/tests/config_test/config_test.routing.yml
+++ b/core/modules/config/tests/config_test/config_test.routing.yml
@@ -1,6 +1,7 @@
 config_test.list_page:
   path: '/admin/structure/config_test'
   defaults:
+    _title: 'Test configuration'
     _entity_list: 'config_test'
   requirements:
     _access: 'TRUE'
@@ -15,6 +16,7 @@ config_test.entity_add:
 config_test.entity:
   path: 'admin/structure/config_test/manage/{config_test}'
   defaults:
+    _title: 'Edit'
     _controller: '\Drupal\config_test\ConfigTestController::edit'
     entity_type: 'config_test'
   requirements:
@@ -23,6 +25,7 @@ config_test.entity:
 config_test.entity_enable:
   path: 'admin/structure/config_test/manage/{config_test}/enable'
   defaults:
+    _title: 'Enable'
     _content: '\Drupal\config_test\ConfigTestController::enable'
     entity_type: 'config_test'
   requirements:
@@ -31,6 +34,7 @@ config_test.entity_enable:
 config_test.entity_disable:
   path: 'admin/structure/config_test/manage/{config_test}/disable'
   defaults:
+    _title: 'Disable'
     _content: '\Drupal\config_test\ConfigTestController::disable'
     entity_type: 'config_test'
   requirements:
@@ -39,6 +43,7 @@ config_test.entity_disable:
 config_test.entity_delete:
   path: 'admin/structure/config_test/manage/{config_test}/delete'
   defaults:
+    _title: 'Delete'
     _entity_form: 'config_test.delete'
     entity_type: 'config_test'
   requirements:
diff --git a/core/modules/system/system.local_tasks.yml b/core/modules/system/system.local_tasks.yml
index b29773d..575e515 100644
--- a/core/modules/system/system.local_tasks.yml
+++ b/core/modules/system/system.local_tasks.yml
@@ -3,10 +3,10 @@ system.rss_feeds_settings_tab:
   title: Settings
   tab_root_id: system.rss_feeds_settings_tab
 
-system.site_maintenance_mode_settings_tab:
+system.site_maintenance_mode_tab:
   route_name: system.site_maintenance_mode
   title: Settings
-  tab_root_id: system.site_maintenance_mode_settings_tab
+  tab_root_id: system.site_maintenance_mode_tab
 
 system.site_information_settings_tab:
   route_name: system.site_information_settings
diff --git a/core/modules/user/user.local_tasks.yml b/core/modules/user/user.local_tasks.yml
index c82874b..0b40260 100644
--- a/core/modules/user/user.local_tasks.yml
+++ b/core/modules/user/user.local_tasks.yml
@@ -2,3 +2,7 @@ user.role_list_tab:
   route_name: user.role_list
   title: 'Roles'
   tab_root_id: user.role_list_tab
+user.account_settings_tab:
+  route_name: user.account_settings
+  title: 'Settings'
+  tab_root_id: user.account_settings_tab
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index c73155b..d612d52 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -833,10 +833,6 @@ function user_menu() {
     'weight' => -10,
     'route_name' => 'user.account_settings',
   );
-  $items['admin/config/people/accounts/settings'] = array(
-    'title' => 'Settings',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
 
   $items['user/%user'] = array(
     'title' => 'My account',