diff --git a/core/modules/system/tests/routing.test b/core/modules/system/tests/routing.test
index c0a9bcbcbfd..5bf499570af 100644
--- a/core/modules/system/tests/routing.test
+++ b/core/modules/system/tests/routing.test
@@ -8,17 +8,14 @@
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\simpletest\UnitTestBase;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Routing\UrlMatcherDumper;
 
 /**
  * Basic tests for the UrlMatcherDumper.
- *
- * Note: This should be a UnitTestBase, but those are broken right now in
- * Drupal HEAD.  Convert it to a UnitTest when that gets fixed.
  */
-class UrlMatcherDumperTestCase extends WebTestBase {
+class UrlMatcherDumperTestCase extends UnitTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Routing',
@@ -213,11 +210,8 @@ class UrlMatcherDumperTestCase extends WebTestBase {
 
 /**
  * Basic tests for the Route.
- *
- * Note: This should be a UnitTestBase, but those are broken right now in
- * Drupal HEAD.  Convert it to a UnitTest when that gets fixed.
  */
-class RouteTestCase extends WebTestBase {
+class RouteTestCase extends UnitTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Routes',
diff --git a/core/vendor/Routing b/core/vendor/Routing
new file mode 160000
index 00000000000..a05bcaaaa43
--- /dev/null
+++ b/core/vendor/Routing
@@ -0,0 +1 @@
+Subproject commit a05bcaaaa43025037a0667e158aed9b65a147e80