...igPipeNoJsDetectionTest.php => BigPipeTest.php} | 27 +++++++++++++++++-----
 .../big_pipe_test/src/BigPipeTestController.php    |  2 ++
 .../Render/Placeholder/BigPipeStrategyTest.php     |  2 ++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/Tests/BigPipeNoJsDetectionTest.php b/src/Tests/BigPipeTest.php
similarity index 95%
rename from src/Tests/BigPipeNoJsDetectionTest.php
rename to src/Tests/BigPipeTest.php
index 4bd6c8b..7cc82c1 100644
--- a/src/Tests/BigPipeNoJsDetectionTest.php
+++ b/src/Tests/BigPipeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\big_pipe\Tests\BigPipeNoJsDetectionTest.
+ * Contains \Drupal\big_pipe\Tests\BigPipeTest.
  */
 
 namespace Drupal\big_pipe\Tests;
@@ -13,16 +13,17 @@ use Drupal\Core\Url;
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Tests BigPipe's no-JS detection.
+ * Tests BigPipe's no-JS detection & response delivery (with and without JS).
  *
  * Covers:
  * - big_pipe_page_attachments()
- * - \Drupal\big_pipe\Controller\BigPipeController.
+ * - \Drupal\big_pipe\Controller\BigPipeController
+ * - \Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber
+ * - \Drupal\big_pipe\Render\BigPipe
  *
  * @group big_pipe
  */
-// @todo rename to BigPipeTest
-class BigPipeNoJsDetectionTest extends WebTestBase {
+class BigPipeTest extends WebTestBase {
 
   const START_SIGNAL= '<script type="application/json" data-big-pipe-event="start"></script>';
   const STOP_SIGNAL= '<script type="application/json" data-big-pipe-event="stop"></script>';
@@ -53,7 +54,11 @@ class BigPipeNoJsDetectionTest extends WebTestBase {
   }
 
   /**
-   * Tests big_pipe_page_attachments() + \Drupal\big_pipe\Controller\BigPipeController.
+   * Tests BigPipe's no-JS detection.
+   *
+   * Covers:
+   * - big_pipe_page_attachments()
+   * - \Drupal\big_pipe\Controller\BigPipeController
    */
   public function testNoJsDetection() {
     $this->container->get('module_installer')->install(['session_exists_cache_context_test']);
@@ -91,6 +96,11 @@ class BigPipeNoJsDetectionTest extends WebTestBase {
 
   /**
    * Tests BigPipe-delivered HTML responses when JavaScript is enabled.
+   *
+   * Covers:
+   * - \Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber
+   * - \Drupal\big_pipe\Render\BigPipe
+   * - \Drupal\big_pipe\Render\BigPipe::sendPlaceholders()
    */
   public function testBigPipe() {
     $this->drupalLogin($this->rootUser);
@@ -219,6 +229,11 @@ class BigPipeNoJsDetectionTest extends WebTestBase {
 
   /**
    * Tests BigPipe-delivered HTML responses when JavaScript is disabled.
+   *
+   * Covers:
+   * - \Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber
+   * - \Drupal\big_pipe\Render\BigPipe
+   * - \Drupal\big_pipe\Render\BigPipe::sendNoJsPlaceholders()
    */
   public function testBigPipeNoJs() {
     $this->drupalLogin($this->rootUser);
diff --git a/tests/modules/big_pipe_test/src/BigPipeTestController.php b/tests/modules/big_pipe_test/src/BigPipeTestController.php
index 9149483..6859db5 100644
--- a/tests/modules/big_pipe_test/src/BigPipeTestController.php
+++ b/tests/modules/big_pipe_test/src/BigPipeTestController.php
@@ -38,6 +38,8 @@ class BigPipeTestController extends ControllerBase {
 
   /**
    * @see \Drupal\Tests\big_pipe\Unit\Render\Placeholder\BigPipeStrategyTest::placeholdersProvider()
+   * @see \Drupal\big_pipe\Tests\BigPipeTest::testBigPipe()
+   * @see \Drupal\big_pipe\Tests\BigPipeTest::testBigPipeNoJs()
    */
   public function test() {
     $build = [];
diff --git a/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php b/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
index 0698d1b..e33c499 100644
--- a/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
+++ b/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
@@ -56,6 +56,8 @@ class BigPipeStrategyTest extends UnitTestCase {
 
   /**
    * @see \Drupal\big_pipe_test\BigPipeTestController::test()
+   * @see \Drupal\big_pipe\Tests\BigPipeTest::testBigPipe()
+   * @see \Drupal\big_pipe\Tests\BigPipeTest::testBigPipeNoJs()
    */
   public function placeholdersProvider() {
     // Define the two types of cacheability that we expect to see. These will be