.../comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php b/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
index 3865191..074df52 100644
--- a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
+++ b/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
@@ -89,8 +89,8 @@ public function testCacheTags() {
       'config:field.field.comment.comment.comment_body',
       'config:field.field.entity_test.entity_test.comment',
       'config:field.storage.comment.comment_body',
+      'config:filter_format_list',
       'config:user.settings',
-      'user:1',
     ];
     sort($expected_cache_tags);
     $this->assertEqual($build['#cache']['tags'], $expected_cache_tags);
@@ -136,8 +136,8 @@ public function testCacheTags() {
       'config:field.field.comment.comment.comment_body',
       'config:field.field.entity_test.entity_test.comment',
       'config:field.storage.comment.comment_body',
+      'config:filter_format_list',
       'config:user.settings',
-      'user:1',
     ];
     sort($expected_cache_tags);
     $this->assertEqual($build['#cache']['tags'], $expected_cache_tags);
@@ -151,10 +151,10 @@ public function testCacheTags() {
       ->view($commented_entity);
     $renderer->renderRoot($build);
 
-    // The entity itself was cached but the top-level element is max-age 0 due
-    // to the bubbled up max age due to the lazy-built comment form.
+    // The entity itself was cached, and the the top-level element also has a
+    // non-zero max-age despite the lazy-built form.
     $this->assertIdentical(Cache::PERMANENT, $build['entity']['#cache']['max-age']);
-    $this->assertIdentical(0, $build['#cache']['max-age'], 'Top level render array has max-age 0');
+    $this->assertIdentical(Cache::PERMANENT, $build['#cache']['max-age'], 'Comment form is cacheable.');
 
     // The children (fields) of the entity render array are only built in case
     // of a cache miss.