...cheabilitySafeguardTest.php => NodeAccessAutoBubblingTest.php} | 8 ++++----
 .../src/Controller/NodeAccessTestAutoBubblingController.php       | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/modules/node/src/Tests/NodeAccessCacheabilitySafeguardTest.php b/core/modules/node/src/Tests/NodeAccessAutoBubblingTest.php
similarity index 86%
rename from core/modules/node/src/Tests/NodeAccessCacheabilitySafeguardTest.php
rename to core/modules/node/src/Tests/NodeAccessAutoBubblingTest.php
index b2f930e..9085672 100644
--- a/core/modules/node/src/Tests/NodeAccessCacheabilitySafeguardTest.php
+++ b/core/modules/node/src/Tests/NodeAccessAutoBubblingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\NodeAccessCacheabilitySafeguardTest.
+ * Contains \Drupal\node\Tests\NodeAccessAutoBubblingTest.
  */
 
 namespace Drupal\node\Tests;
@@ -10,13 +10,13 @@
 use Drupal\Core\Url;
 
 /**
- * Tests the node access cacheability safeguard.
+ * Tests the node access automatic cacheability bubbling logic.
  *
  * @group node
  * @group Cache
  * @group cacheability_safeguards
  */
-class NodeAccessCacheabilitySafeguardTest extends NodeTestBase {
+class NodeAccessAutoBubblingTest extends NodeTestBase {
 
   /**
    * Modules to enable.
@@ -43,7 +43,7 @@ protected function setUp() {
   /**
    * Tests that the node grants cache context is auto-added, only when needed.
    *
-   * @see \Drupal\cacheability_safeguards\CacheabilityBubblingNodeGrantStorage
+   * @see node_query_node_access_alter()
    */
   public function testNodeAccessCacheabilitySafeguard() {
     $this->dumpHeaders = TRUE;
diff --git a/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php b/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
index 89e7ce4..1fcaa4b 100644
--- a/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
+++ b/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
@@ -54,7 +54,6 @@ public function latest() {
       ->condition('status', NODE_PUBLISHED)
       ->sort('created', 'DESC')
       ->range(0, 3)
-      ->addTag('node_access')
       ->execute();
     return ['#markup' => $this->t('The three latest nodes are: @nids.', ['@nids' => implode(', ', $nids)])];
   }