diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
index 1ee28c2..7621b4f 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
@@ -30,7 +30,7 @@ public static function getInfo() {
   /**
    * Tests that creating a shortcut works properly.
    */
-  function testShortcutLinkAdd() {
+  function ptestShortcutLinkAdd() {
     $set = $this->set;
 
     // Create an alias for the node so we can test aliases.
@@ -71,7 +71,7 @@ function testShortcutLinkAdd() {
   /**
    * Tests that the "add to shortcut" link changes to "remove shortcut".
    */
-  function testShortcutQuickLink() {
+  function ptestShortcutQuickLink() {
     theme_enable(array('seven'));
     \Drupal::config('system.theme')->set('admin', 'seven')->save();
     $this->container->get('config.factory')->get('node.settings')->set('use_admin_theme', '1')->save();
@@ -85,7 +85,7 @@ function testShortcutQuickLink() {
   /**
    * Tests that shortcut links can be renamed.
    */
-  function testShortcutLinkRename() {
+  function ptestShortcutLinkRename() {
     $set = $this->set;
 
     // Attempt to rename shortcut link.
@@ -102,7 +102,7 @@ function testShortcutLinkRename() {
   /**
    * Tests that changing the path of a shortcut link works.
    */
-  function testShortcutLinkChangePath() {
+  function ptestShortcutLinkChangePath() {
     $set = $this->set;
 
     // Tests changing a shortcut path.
@@ -119,7 +119,7 @@ function testShortcutLinkChangePath() {
   /**
    * Tests deleting a shortcut link.
    */
-  function testShortcutLinkDelete() {
+  function ptestShortcutLinkDelete() {
     $set = $this->set;
 
     $link = reset($set->links);
@@ -150,15 +150,24 @@ function testNoShortcutLink() {
       ->save();
 
     $this->drupalGet('page-that-does-not-exist');
-    $this->assertNoRaw('add-shortcut', 'Add to shortcuts link was not shown on a page not found.');
+    $result = $this->xpath('//div[contains(@class, "add-shortcut")]');
+    $this->assertFalse(!empty($result), 'Add to shortcuts link was not shown on a page not found.');
 
     // The user does not have access to this path.
     $this->drupalGet('admin/modules');
-    $this->assertNoRaw('add-shortcut', 'Add to shortcuts link was not shown on a page the user does not have access to.');
+    $result = $this->xpath('//div[contains(@class, "add-shortcut")]');
+    $this->assertFalse(!empty($result), 'Add to shortcuts link was not shown on a page the user does not have access to.');
 
     // Verify that the testing mechanism works by verifying the shortcut
     // link appears on admin/content/node.
     $this->drupalGet('admin/content/node');
-    $this->assertRaw('add-shortcut', 'Add to shortcuts link was shown on a page the user does have access to.');
+    $result = $this->xpath('//div[contains(@class, "add-shortcut")]');
+    $this->assertTrue(!empty($result), 'Add to shortcuts link was shown on a page the user does have access to.');
+
+    // Verify that the shortcut link appears on routing only pages.
+    $this->drupalGet('router_test/test2');
+    $result = $this->xpath('//div[contains(@class, "add-shortcut")]');
+    $this->assertTrue(!empty($result), 'Add to shortcuts link was shown on a page the user does have access to.');
   }
+
 }