diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
index 6780cf7..3a0b20b 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
@@ -19,7 +19,7 @@ class UserAccountLinksTests extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('menu', 'block');
+  public static $modules = array('menu', 'block', 'test_page_test');
 
   public static function getInfo() {
     return array(
@@ -33,12 +33,24 @@ public static function getInfo() {
    * Tests the secondary menu.
    */
   function testSecondaryMenu() {
+    // For a logged-out user, expect no secondary links.
+    $this->drupalGet('test-page');
+    $element = $this->xpath('//ul[@id=:menu_id]', array(':menu_id' => 'secondary-menu'));
+    $this->assertEqual(count($element), 0, 'No secondary-menu for logged-out users.');
+
+    theme_enable(array('bartik'));
+    variable_set('theme_default', 'bartik');
+    $this->drupalGet('test-page');
+    $element = $this->xpath('//ul[@id=:menu_id]', array(':menu_id' => 'secondary-menu-links'));
+    $this->assertEqual(count($element), 0, 'No secondary-menu for logged-out users.');
+    return;
+
     // Create a regular user.
     $user = $this->drupalCreateUser(array());
 
     // Log in and get the homepage.
     $this->drupalLogin($user);
-    $this->drupalGet('<front>');
+    $this->drupalGet('');
 
     // For a logged-in user, expect the secondary menu to have links for "My
     // account" and "Log out".
@@ -55,20 +67,12 @@ function testSecondaryMenu() {
       ':text' => 'Log out',
     ));
     $this->assertEqual(count($link), 1, 'Log out link is in secondary menu.');
-
-    // Log out and get the homepage.
-    $this->drupalLogout();
-    $this->drupalGet('<front>');
-
-    // For a logged-out user, expect no secondary links.
-    $element = $this->xpath('//ul[@id=:menu_id]', array(':menu_id' => 'secondary-menu'));
-    $this->assertEqual(count($element), 0, 'No secondary-menu for logged-out users.');
   }
 
   /**
    * Tests disabling the 'My account' link.
    */
-  function testDisabledAccountLink() {
+  function xtestDisabledAccountLink() {
     // Create an admin user and log in.
     $this->drupalLogin($this->drupalCreateUser(array('access administration pages', 'administer menu')));
 
@@ -97,7 +101,7 @@ function testDisabledAccountLink() {
   /**
    * Tests page title is set correctly on user account tabs.
    */
-  function testAccountPageTitles() {
+  function xtestAccountPageTitles() {
     // Default page titles are suffixed with the site name - Drupal.
     $title_suffix = ' | Drupal';
 
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index f2747c7..0695468 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1167,6 +1167,16 @@ function user_menu_link_load($menu_links) {
 }
 
 /**
+ * Implements hook_translated_menu_link_alter().
+ */
+function CORRECTuser_translated_menu_link_alter(&$link, $map) {
+  // Hide the "User account" link for anonymous users.
+  if ($link['link_path'] == 'user' && $link['module'] == 'system' && !$GLOBALS['user']->uid) {
+    $link['hidden'] = 1;
+  }
+}
+
+/**
  * Implements hook_admin_paths().
  */
 function user_admin_paths() {