diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
index f3432d7..2a6bb85 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
@@ -73,6 +73,8 @@ function testList() {
     );
 
     $actual_operations = $controller->getOperations($entity);
+    // Sort the operations to normalize link order.
+    uasort($actual_operations, 'drupal_sort_weight');
     $this->assertIdentical($expected_operations, $actual_operations);
 
     // Test buildHeader() method.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php
index 0de18ac..3dbc260 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php
@@ -128,9 +128,9 @@ public function testTitleArea() {
         'title' => 'Overridden title',
       ),
     ));
-    $view->save();
 
-    $view->storage->enable();
+    $view->storage->enable()->save();
+
     // Force the rebuild of the menu.
     menu_router_rebuild();
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Node/StatusExtraTest.php b/core/modules/views/lib/Drupal/views/Tests/Node/StatusExtraTest.php
index 4cade1e..ed8bdd7 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Node/StatusExtraTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Node/StatusExtraTest.php
@@ -28,7 +28,8 @@ public static function getInfo() {
   public function testStatusExtra() {
     // @todo For whatever reason the menu has to be rebuilt or drupalGet will
     // fail.
-    state()->set('menu_rebuild_needed', TRUE);
+    menu_router_rebuild();
+
     $column_map = array('nid' => 'nid');
     $node_author = $this->drupalCreateUser(array('view own unpublished content'));
     $node_author_not_unpublished = $this->drupalCreateUser();