diff --git a/core/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php
index 53ed6262ee..83b5f19579 100644
--- a/core/lib/Drupal/Core/Routing/RouteProvider.php
+++ b/core/lib/Drupal/Core/Routing/RouteProvider.php
@@ -165,7 +165,7 @@ public function getRouteCollectionForRequest(Request $request) {
         'routes' => $routes,
       ];
       $this->cache->set($cid, $cache_value, CacheBackendInterface::CACHE_PERMANENT, ['route_match']);
-      return $routes;
+      return $routes
     }
   }
 
diff --git a/core/modules/page_cache/src/Tests/PageCacheTest.php b/core/modules/page_cache/src/Tests/PageCacheTest.php
index 1ec9282eb5..b7db992e3a 100644
--- a/core/modules/page_cache/src/Tests/PageCacheTest.php
+++ b/core/modules/page_cache/src/Tests/PageCacheTest.php
@@ -63,6 +63,7 @@ function testPageCacheTags() {
     sort($cache_entry->tags);
     $expected_tags = array(
       'config:user.role.anonymous',
+      'http_response',
       'pre_render',
       'rendered',
       'system_test_cache_tags_page',
@@ -94,6 +95,7 @@ function testPageCacheTagsIndependentFromCacheabilityHeaders() {
     sort($cache_entry->tags);
     $expected_tags = array(
       'config:user.role.anonymous',
+      'http_response',
       'pre_render',
       'rendered',
       'system_test_cache_tags_page',
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
index d7651c4b90..195e00d0f5 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
@@ -2,8 +2,10 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\Node;
 
+use Drupal\jsonapi\Configuration\ResourceConfig;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
+use Drupal\rest\Entity\RestResourceConfig;
 use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\user\Entity\User;
 
@@ -37,6 +39,14 @@
    */
   protected $entity;
 
+  public function setUp() {
+    parent::setUp();
+
+    // We don't want to ship with a node resource by default for those tests.
+    RestResourceConfig::load('entity.node')->delete();
+  }
+
+
   /**
    * {@inheritdoc}
    */