diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
index b6731ac..d0b8ab0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
@@ -205,7 +205,7 @@ function testAuthUserUserLogin() {
 
     $this->drupalGet('user/login');
     // Check that we got to 'user'.
-    $this->assertTrue($this->url == url('user/' . $this->loggedInUser->uid, array('absolute' => TRUE)), "Logged-in user redirected to user on accessing user/login");
+    $this->assertTrue($this->url == url('user', array('absolute' => TRUE)), "Logged-in user redirected to user on accessing user/login");
 
     // user/register should redirect to user/UID/edit.
     $this->drupalGet('user/register');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php b/core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php
index b338b7b..00f4b13 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php
@@ -52,7 +52,7 @@ protected function testHttpsSession() {
     // login form through https.php, which creates a mock HTTPS request.
     $this->drupalGet('user');
     $form = $this->xpath('//form[@id="user-login-form"]');
-    $form[0]['action'] = $this->httpsUrl('user');
+    $form[0]['action'] = $this->httpsUrl('user/login');
     $edit = array('name' => $user->name, 'pass' => $user->pass_raw);
     $this->drupalPost(NULL, $edit, t('Log in'));
 
@@ -60,7 +60,7 @@ protected function testHttpsSession() {
     $this->curlClose();
     $this->drupalGet('user');
     $form = $this->xpath('//form[@id="user-login-form"]');
-    $form[0]['action'] = $this->httpsUrl('user');
+    $form[0]['action'] = $this->httpsUrl('user/login');
     $this->drupalPost(NULL, $edit, t('Log in'));
 
     // Check secure cookie on secure page.
@@ -143,13 +143,13 @@ protected function testHttpsSession() {
     $this->drupalGet('user/password');
     $form = $this->xpath('//form[@id="user-pass"]');
     $this->assertNotEqual(substr($form[0]['action'], 0, 6), 'https:', 'Password request form action is not secure');
-    $form[0]['action'] = $this->httpsUrl('user');
+    $form[0]['action'] = $this->httpsUrl('user/login');
 
     // Check that user login form action is secure.
     $this->drupalGet('user');
     $form = $this->xpath('//form[@id="user-login-form"]');
     $this->assertEqual(substr($form[0]['action'], 0, 6), 'https:', 'Login form action is secure');
-    $form[0]['action'] = $this->httpsUrl('user');
+    $form[0]['action'] = $this->httpsUrl('user/login');
 
     $edit = array(
       'name' => $user->name,
@@ -205,7 +205,7 @@ protected function testHttpsSession() {
     // Mock a login to the secure site using the secure session cookie.
     $this->drupalGet('user');
     $form = $this->xpath('//form[@id="user-login-form"]');
-    $form[0]['action'] = $this->httpsUrl('user');
+    $form[0]['action'] = $this->httpsUrl('user/login');
     $this->drupalPost(NULL, $edit, t('Log in'));
 
     // Test that the user is also authenticated on the insecure site.