diff --git a/core/tests/Drupal/Tests/Core/Routing/NonAdminRoutesPreloaderTest.php b/core/tests/Drupal/Tests/Core/Routing/NonAdminRoutesPreloaderTest.php
index 54fd761..c2f5740 100644
--- a/core/tests/Drupal/Tests/Core/Routing/NonAdminRoutesPreloaderTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/NonAdminRoutesPreloaderTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Routing\NonAdminRoutesPreloader;
 use Drupal\Tests\UnitTestCase;
+use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
@@ -30,7 +31,7 @@ class NonAdminRoutesPreloaderTest extends UnitTestCase {
   /**
    * The mocked state.
    *
-   * @var \Drupal\Core\KeyValueStore\KeyValueStoreInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\KeyValueStore\StateInterface|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $state;
 
@@ -64,7 +65,7 @@ public static function getInfo() {
    */
   protected function setUp() {
     $this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
-    $this->state = $this->getMock('\Drupal\Core\KeyValueStore\KeyValueStoreInterface');
+    $this->state = $this->getMock('\Drupal\Core\KeyValueStore\StateInterface');
     $this->negotiation = $this->getMockBuilder('\Drupal\Core\ContentNegotiation')
       ->disableOriginalConstructor()
       ->getMock();
@@ -89,6 +90,7 @@ public function testOnAlterRoutesWithAdminRoutes() {
       ->method('set')
       ->with('routing.non_admin_routes', array());
     $this->preloader->onAlterRoutes($event);
+    $this->preloader->onFinishedRoutes(new Event());
   }
 
   /**
@@ -111,6 +113,7 @@ public function testOnAlterRoutesWithNonAdminRoutes() {
       ->method('set')
       ->with('routing.non_admin_routes', array('test2'));
     $this->preloader->onAlterRoutes($event);
+    $this->preloader->onFinishedRoutes(new Event());
   }
 
   /**