diff --git a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
index 478f8e4..2a2f554 100644
--- a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
+++ b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
@@ -18,8 +18,7 @@
 use Symfony\Component\Routing\RouterInterface;
 
 /**
- * Class AccessAwareRouter
- * @package Drupal\Core\Routing
+ * A router class for Drupal with access check and upcasting.
  */
 class AccessAwareRouter implements RouterInterface, RequestMatcherInterface {
 
diff --git a/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
index 0db6826..b431962 100644
--- a/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
+++ b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
@@ -56,7 +56,7 @@ public function test8() {
   public function test9($uid) {
     $text = 'Route not matched.';
     try {
-      $match = \Drupal::service('router')->match('/user/' . $uid);
+      $match = \Drupal::service('router.insecure')->match('/user/' . $uid);
       if (isset($match['user']) && $match['user'] instanceof UserInterface) {
         $text = sprintf('User route "%s" was matched.', $match[RouteObjectInterface::ROUTE_NAME]);
       }
diff --git a/core/tests/Drupal/Tests/Core/ExternalUrlTest.php b/core/tests/Drupal/Tests/Core/ExternalUrlTest.php
index ce0fb84..4aa66cb 100644
--- a/core/tests/Drupal/Tests/Core/ExternalUrlTest.php
+++ b/core/tests/Drupal/Tests/Core/ExternalUrlTest.php
@@ -53,7 +53,7 @@ protected function setUp() {
 
     $this->router = $this->getMock('Drupal\Tests\Core\Routing\TestRouterInterface');
     $container = new ContainerBuilder();
-    $container->set('router', $this->router);
+    $container->set('router.insecure', $this->router);
     $container->set('url_generator', $this->urlGenerator);
     \Drupal::setContainer($container);
   }