diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusUITest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusUITest.php
index d33998d..642fe2e 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusUITest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusUITest.php
@@ -41,15 +41,17 @@ function testCRUD() {
     );
     $this->drupalPost('admin/structure/config_test/add', $edit, 'Save');
 
+    $uri = entity_load('config_test', $id)->uri();
+
     // Disable an entity.
-    $disable_path = "admin/structure/config_test/manage/$id/disable";
+    $disable_path = "{$uri['path']}/disable";
     $this->assertLinkByHref($disable_path);
     $this->drupalGet($disable_path);
     $this->assertResponse(200);
     $this->assertNoLinkByHref($disable_path);
 
     // Enable an entity.
-    $enable_path = "admin/structure/config_test/manage/$id/enable";
+    $enable_path = "{$uri['path']}/enable";
     $this->assertLinkByHref($enable_path);
     $this->drupalGet($enable_path);
     $this->assertResponse(200);
diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index 3ae9059..677a066 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -165,6 +165,8 @@ function config_test_config_test_create(ConfigTest $config_test) {
  *
  * @param Drupal\config_test\ConfigTest $config_test
  *   The ConfigTest object to enable.
+ *
+ * @return \Symfony\Component\HttpFoundation\RedirectResponse.
  */
 function config_test_entity_enable(ConfigTest $config_test) {
   $config_test->enable()->save();
@@ -176,6 +178,8 @@ function config_test_entity_enable(ConfigTest $config_test) {
  *
  * @param Drupal\config_test\ConfigTest $config_test
  *   The ConfigTest object to disable.
+ *
+ * @return \Symfony\Component\HttpFoundation\RedirectResponse.
  */
 function config_test_entity_disable(ConfigTest $config_test) {
   $config_test->disable()->save();
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php
index a7f2ea6..8663117 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php
@@ -33,10 +33,6 @@ public static function getInfo() {
    * Tests the status extra filter.
    */
   public function testStatusExtra() {
-    // @todo For whatever reason the menu has to be rebuilt or drupalGet will
-    // fail.
-    menu_router_rebuild();
-
     $column_map = array('nid' => 'nid');
     $node_author = $this->drupalCreateUser(array('view own unpublished content'));
     $node_author_not_unpublished = $this->drupalCreateUser();