diff --cc core/modules/views/src/Tests/GlossaryTest.php
index 72854e9,8919854..0000000
--- a/core/modules/views/src/Tests/GlossaryTest.php
+++ b/core/modules/views/src/Tests/GlossaryTest.php
@@@ -71,29 -71,28 +71,40 @@@ class GlossaryTest extends ViewTestBas
      $url = Url::fromRoute('view.glossary.page_1');

      // Verify cache tags.
 -    $this->assertPageCacheContextsAndTags($url, ['languages:' . LanguageInterface::TYPE_CONTENT, 'languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'url', 'user.node_grants:view', 'user.permissions'], [
 -      'config:views.view.glossary',
 -      // Listed for letter 'a'.
 -      'node:' . $nodes_by_char['a'][0]->id(), 'node:' . $nodes_by_char['a'][1]->id(), 'node:' . $nodes_by_char['a'][2]->id(),
 -      // Link for letter 'd'.
 -      'node:1',
 -      // Link for letter 'p'.
 -      'node:16',
 -      // Link for letter 'r'.
 -      'node:2',
 -      // Link for letter 'l'.
 -      'node:21',
 -      // Link for letter 'u'.
 -      'node:6',
 -      'node_list',
 -      'user:0',
 -      'user_list',
 -      'rendered',
 -      // FinishResponseSubscriber adds this cache tag to responses that have the
 -      // 'user.permissions' cache context for anonymous users.
 -      'config:user.role.anonymous',
 -    ]);
 +    $this->assertPageCacheContextsAndTags(
 +      $url,
 +      [
 +        'languages:' . LanguageInterface::TYPE_CONTENT,
 +        'languages:' . LanguageInterface::TYPE_INTERFACE,
 +        'theme',
 +        'url',
 +        'user.node_grants:view',
 +        'user.permissions',
 +        'route',
 +      ],
 +      [
 +        'config:views.view.glossary',
++        // Listed for letter 'a'
 +        'node:' . $nodes_by_char['a'][0]->id(), 'node:' . $nodes_by_char['a'][1]->id(), 'node:' . $nodes_by_char['a'][2]->id(),
++        // Link for letter 'd'.
++        'node:1',
++        // Link for letter 'p'.
++        'node:16',
++        // Link for letter 'r'.
++        'node:2',
++        // Link for letter 'l'.
++        'node:21',
++        // Link for letter 'u'.
++        'node:6',
 +        'node_list',
 +        'user:0',
 +        'user_list',
 +        'rendered',
 +        // FinishResponseSubscriber adds this cache tag to responses that have the
 +        // 'user.permissions' cache context for anonymous users.
 +        'config:user.role.anonymous',
 +      ]
 +    );

      // Check the actual page response.
      $this->drupalGet($url);