core/modules/search/lib/Drupal/search/Tests/SearchPageOverrideTest.php

@@ -38,7 +38,7 @@ function setUp() {
 
     // Enable the extra type module for searching.
     \Drupal::config('search.settings')->set('active_plugins', array('node_search', 'user_search', 'search_extra_type_search'))->save();
-    \Drupal::service('router.builder')->rebuild();
+    \Drupal::state()->set('menu_rebuild_needed', TRUE);
   }
 
   function testSearchPageHook() {

core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutTestBase.php

@@ -69,7 +69,7 @@ function setUp() {
     }
 
     // Create users.
-    $this->admin_user = $this->drupalCreateUser(array('access toolbar', 'administer shortcuts', 'view the administration theme', 'create article content', 'create page content', 'access content overview', 'administer users'));
+    $this->admin_user = $this->drupalCreateUser(array('access toolbar', 'administer shortcuts', 'view the administration theme', 'create article content', 'create page content', 'access content overview'));
     $this->shortcut_user = $this->drupalCreateUser(array('customize shortcut links', 'switch shortcut sets'));
 
     // Create a node.