core/modules/big_pipe/src/Tests/BigPipeTest.php        |  6 +++---
 .../modules/big_pipe_test/big_pipe_test.routing.yml    |  8 ++++----
 .../big_pipe_test/src/BigPipeTestController.php        |  7 ++++---
 .../src/FunctionalJavascript/BigPipeRegressionTest.php | 18 ++++++++++--------
 .../big_pipe_test_theme/big_pipe_test_theme.info.yml   |  4 ++--
 .../templates/field--comment.html.twig                 | 14 +++-----------
 6 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/core/modules/big_pipe/src/Tests/BigPipeTest.php b/core/modules/big_pipe/src/Tests/BigPipeTest.php
index 1fec519..32eb4df 100644
--- a/core/modules/big_pipe/src/Tests/BigPipeTest.php
+++ b/core/modules/big_pipe/src/Tests/BigPipeTest.php
@@ -270,9 +270,9 @@ public function testBigPipeNoJs() {
   }
 
   /**
-   * Tests BigPipe responses do not include duplicate placeholder replacements.
+   * Tests BigPipe with a multi-occurrence placeholder.
    */
-  public function testBigPipeJsMultipleOccurrencePlaceholders() {
+  public function testBigPipeMultiOccurrencePlaceholders() {
     $this->drupalLogin($this->rootUser);
     $this->assertSessionCookieExists(TRUE);
     $this->assertBigPipeNoJsCookieExists(FALSE);
@@ -283,7 +283,7 @@ public function testBigPipeJsMultipleOccurrencePlaceholders() {
     // @see setUp()
     // @see performMetaRefresh()
 
-    $this->drupalGet(Url::fromRoute('big_pipe_duplicate_placeholders'));
+    $this->drupalGet(Url::fromRoute('big_pipe_test_multi_occurrence'));
     $big_pipe_placeholder_id = 'callback=Drupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AplaceholderContent&args[0]=awesome&token=d13e3d6c';
     $expected_placeholder_replacement = '<script type="application/vnd.drupal-ajax" data-big-pipe-replacement-for-placeholder-with-id="' . $big_pipe_placeholder_id . '">';
     $raw_content = $this->getRawContent();
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.routing.yml b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.routing.yml
index e60481c..7105060 100644
--- a/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.routing.yml
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.routing.yml
@@ -16,11 +16,11 @@ no_big_pipe:
   requirements:
     _access: 'TRUE'
 
-big_pipe_duplicate_placeholders:
-  path: '/big_pipe_duplicate_placeholders'
+big_pipe_test_multi_occurrence:
+  path: '/big_pipe_test_multi_occurrence'
   defaults:
-    _controller: '\Drupal\big_pipe_test\BigPipeTestController::duplicates'
-    _title: 'BigPipe with duplicate placeholders test'
+    _controller: '\Drupal\big_pipe_test\BigPipeTestController::multiOccurrence'
+    _title: 'BigPipe test multiple occurrences of the same placeholder'
   requirements:
     _access: 'TRUE'
 
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php b/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
index 1327f37..c4d545e 100644
--- a/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
@@ -53,12 +53,13 @@ public static function nope() {
   }
 
   /**
-   * Returns a render array with duplicate lazy_builder placeholders to test
-   * BigPipe handling of duplicates.
+   * A page with multiple occurrences of the same placeholder.
+   *
+   * @see \Drupal\big_pipe\Tests\BigPipeTest::testBigPipeMultipleOccurrencePlaceholders()
    *
    * @return array
    */
-  public function duplicates() {
+  public function multiOccurrence() {
     $adjective = 'awesome';
     return [
       'item1' => [
diff --git a/core/modules/big_pipe/tests/src/FunctionalJavascript/BigPipeRegressionTest.php b/core/modules/big_pipe/tests/src/FunctionalJavascript/BigPipeRegressionTest.php
index f093791..ab28073 100644
--- a/core/modules/big_pipe/tests/src/FunctionalJavascript/BigPipeRegressionTest.php
+++ b/core/modules/big_pipe/tests/src/FunctionalJavascript/BigPipeRegressionTest.php
@@ -13,7 +13,7 @@
 use Drupal\simpletest\NodeCreationTrait;
 
 /**
- * Big Pipe placeholder functional tests.
+ * BigPipe regression tests.
  *
  * @group big_pipe
  */
@@ -42,24 +42,26 @@ class BigPipeRegressionTest extends JavascriptTestBase {
   public function setUp() {
     parent::setUp();
 
-    // Use the comment test theme.
+    // Use the big_pipe_test_theme theme.
     $this->container->get('theme_installer')->install(['big_pipe_test_theme']);
     $this->container->get('config.factory')->getEditable('system.theme')->set('default', 'big_pipe_test_theme')->save();
-
   }
 
   /**
    * Ensure comment form works with history and big_pipe modules.
+   *
+   * @see https://www.drupal.org/node/2698811
    */
-  public function testCommentFormRegression_2698811() {
+  public function testCommentForm_2698811() {
     // Ensure an `article` node type exists.
     $this->createContentType(['type' => 'article']);
     $this->addDefaultCommentField('node', 'article');
 
     // Enable CKEditor.
+    $format = $this->randomMachineName();
     FilterFormat::create([
-      'format' => 'full_html',
-      'name' => 'Full HTML',
+      'format' => $format,
+      'name' => $this->randomString(),
       'weight' => 1,
       'filters' => [],
     ])->save();
@@ -75,7 +77,7 @@ public function testCommentFormRegression_2698811() {
       ],
     ];
     $editor = Editor::create([
-      'format' => 'full_html',
+      'format' => $format,
       'editor' => 'ckeditor',
     ]);
     $editor->setSettings($settings);
@@ -84,7 +86,7 @@ public function testCommentFormRegression_2698811() {
     $admin_user = $this->drupalCreateUser([
       'access comments',
       'post comments',
-      'use text format full_html',
+      'use text format ' . $format,
     ]);
     $this->drupalLogin($admin_user);
 
diff --git a/core/modules/big_pipe/tests/themes/big_pipe_test_theme/big_pipe_test_theme.info.yml b/core/modules/big_pipe/tests/themes/big_pipe_test_theme/big_pipe_test_theme.info.yml
index d2296e6..2b3c842 100644
--- a/core/modules/big_pipe/tests/themes/big_pipe_test_theme/big_pipe_test_theme.info.yml
+++ b/core/modules/big_pipe/tests/themes/big_pipe_test_theme/big_pipe_test_theme.info.yml
@@ -1,5 +1,5 @@
-name: 'Big Pipe test theme'
+name: 'BigPipe test theme'
 type: theme
-description: 'Theme for testing the duplicate big pipe placeholders'
+description: 'Theme for testing BigPipe edge cases.'
 version: VERSION
 core: 8.x
diff --git a/core/modules/big_pipe/tests/themes/big_pipe_test_theme/templates/field--comment.html.twig b/core/modules/big_pipe/tests/themes/big_pipe_test_theme/templates/field--comment.html.twig
index b59fc87..a26fa78 100644
--- a/core/modules/big_pipe/tests/themes/big_pipe_test_theme/templates/field--comment.html.twig
+++ b/core/modules/big_pipe/tests/themes/big_pipe_test_theme/templates/field--comment.html.twig
@@ -2,20 +2,12 @@
 /**
  * @file
  * Test that comments still work with the form above instead of below.
+ *
+ * @see \Drupal\Tests\big_pipe\FunctionalJavascript\BigPipeRegressionTest::testCommentForm_2698811()
  */
 #}
 <section{{ attributes }}>
-  {% if comments and not label_hidden %}
-    {{ title_prefix }}
-    <h2{{ title_attributes }}>{{ label }}</h2>
-    {{ title_suffix }}
-  {% endif %}
-
-  {% if comment_form %}
-    <h2{{ content_attributes }}>{{ 'Add new comment'|t }}</h2>
-    {{ comment_form }}
-  {% endif %}
+  {{ comment_form }}
 
   {{ comments }}
-
 </section>