diff --git a/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php b/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
index b58f86b2d0a..22d2ea4d9dd 100644
--- a/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
+++ b/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
@@ -47,13 +47,10 @@ class UserLocalTasksTest extends LocalTaskIntegrationTest {
    *
    * @dataProvider getUserLoginRoutes
    */
-  public function testUserLoginLocalTasks($route, $subtask = array()) {
+  public function testUserLoginLocalTasks($route) {
     $tasks = array(
-      0 => array('user.page', 'user.register', 'user.pass',),
+      0 => array('user.register', 'user.pass', 'user.login',),
     );
-    if ($subtask) {
-      $tasks[] = $subtask;
-    }
     $this->assertLocalTasks($route, $tasks);
   }
 
@@ -62,8 +59,7 @@ class UserLocalTasksTest extends LocalTaskIntegrationTest {
    */
   public function getUserLoginRoutes() {
     return array(
-      array('user.page', array('user.login',)),
-      array('user.login', array('user.login',)),
+      array('user.login'),
       array('user.register'),
       array('user.pass'),
     );
diff --git a/core/modules/user/user.links.task.yml b/core/modules/user/user.links.task.yml
index 9d9661da172..be513810571 100644
--- a/core/modules/user/user.links.task.yml
+++ b/core/modules/user/user.links.task.yml
@@ -1,4 +1,3 @@
-
 entity.user_role.edit_form:
   title: 'Edit'
   route_name: entity.user_role.edit_form
@@ -9,24 +8,22 @@ user.account_settings_tab:
   title: 'Settings'
   base_route: entity.user.admin_form
 
-user.page:
-  route_name: user.page
-  base_route: user.page
-  title: 'Log in'
-  weight: -10
 user.register:
   route_name: user.register
   base_route: user.page
   title: 'Create new account'
+
 user.pass:
   route_name: user.pass
   base_route: user.page
   title: 'Reset your password'
+
 # Other authentication methods may add pages below user/login/.
 user.login:
   route_name: user.login
-  parent_id: user.page
-  title: 'Username and password'
+  base_route: user.page
+  title: 'Log in'
+  weight: -10
 
 entity.user.canonical:
   route_name: entity.user.canonical