diff --git a/core/modules/user/tests/Drupal/user/Tests/Menu/UserLocalTasksTest.php b/core/modules/user/tests/Drupal/user/Tests/Menu/UserLocalTasksTest.php
index 5fb9f40..b9ed087 100644
--- a/core/modules/user/tests/Drupal/user/Tests/Menu/UserLocalTasksTest.php
+++ b/core/modules/user/tests/Drupal/user/Tests/Menu/UserLocalTasksTest.php
@@ -44,7 +44,7 @@ public function testUserAdminLocalTasks($route, $expected) {
    */
   public function getUserAdminRoutes() {
     return array(
-      array('user.role_list', array(array('user.role_list_tab'))),
+      array('user.role_list', array(array('user.role_list_tab', 'user.admin_account', 'user.admin_permissions'))),
       array('user.account_settings', array(array('user.account_settings_tab'))),
     );
   }
diff --git a/core/modules/user/user.local_tasks.yml b/core/modules/user/user.local_tasks.yml
index 4540d2b..2109241 100644
--- a/core/modules/user/user.local_tasks.yml
+++ b/core/modules/user/user.local_tasks.yml
@@ -1,7 +1,8 @@
 user.role_list_tab:
-  route_name: user.role_list
   title: 'Roles'
-  tab_root_id: user.role_list_tab
+  route_name: user.role_list
+  tab_root_id: user.admin_account
+  weight: 10
 
 user.role_edit:
   title: 'Edit'
@@ -51,9 +52,3 @@ user.admin_permissions:
   title: Permissions
   route_name: user.admin_permissions
   tab_root_id: user.admin_account
-
-user.admin_roles:
-  title: Roles
-  route_name: user.role_list
-  tab_root_id: user.admin_account
-  weight: 10