diff --git a/core/modules/config/tests/config_test/config_test.local_tasks.yml b/core/modules/config/tests/config_test/config_test.local_tasks.yml
new file mode 100644
index 000000000000..989f131a1713
--- /dev/null
+++ b/core/modules/config/tests/config_test/config_test.local_tasks.yml
@@ -0,0 +1,4 @@
+config_test.entity_tab:
+  route_name: config_test.entity
+  title: 'Edit'
+  tab_root_id: config_test.entity_tab
diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index 48048ad78c57..9c0b042e2752 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -21,10 +21,6 @@ function config_test_menu() {
   $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',
diff --git a/core/modules/system/system.local_tasks.yml b/core/modules/system/system.local_tasks.yml
index b29773d85db3..575e515e3beb 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 c82874ba9b18..0b40260dd945 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 f8a4fb8fd495..f233607292a6 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',