tests/src/Kernel/EntityEmbedFilterTest.php     |  9 +++++----
 tests/src/Kernel/EntityEmbedFilterTestBase.php | 11 +----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/tests/src/Kernel/EntityEmbedFilterTest.php b/tests/src/Kernel/EntityEmbedFilterTest.php
index 9b42050..f2b7203 100644
--- a/tests/src/Kernel/EntityEmbedFilterTest.php
+++ b/tests/src/Kernel/EntityEmbedFilterTest.php
@@ -333,8 +333,6 @@ class EntityEmbedFilterTest extends EntityEmbedFilterTestBase {
   }
 
   /**
-   * Tests integration with the caption filter.
-   *
    * @covers \Drupal\filter\Plugin\Filter\FilterCaption
    * @dataProvider providerCaptionFilterIntegration
    */
@@ -357,6 +355,9 @@ class EntityEmbedFilterTest extends EntityEmbedFilterTestBase {
     $result = $this->processText($content, 'en', $filter_ids);
     $this->setRawContent($result->getProcessedText());
     $this->assertCount($expected_figure ? 1 : 0, $this->cssSelect('figure'));
+    if ($expected_figure) {
+      $this->assertSame('Yo.', (string) $this->cssSelect('figure figcaption')[0]);
+    }
     $this->assertHasAttributes($this->cssSelect('div.embedded-entity')[0], $expected_attributes);
 
     // Expected bubbleable metadata.
@@ -373,12 +374,12 @@ class EntityEmbedFilterTest extends EntityEmbedFilterTestBase {
 
   public function providerCaptionFilterIntegration() {
     return [
-      'only `entity_embed`' => [
+      'only `entity_embed` ⇒ caption absent' => [
         ['entity_embed'],
         FALSE,
         ['entity_embed/caption'],
       ],
-      '`filter_caption` + `entity_embed`' => [
+      '`filter_caption` + `entity_embed` ⇒ caption present' => [
         ['filter_caption', 'entity_embed'],
         TRUE,
         ['filter/caption', 'entity_embed/caption']
diff --git a/tests/src/Kernel/EntityEmbedFilterTestBase.php b/tests/src/Kernel/EntityEmbedFilterTestBase.php
index 1161fb4..7395a13 100644
--- a/tests/src/Kernel/EntityEmbedFilterTestBase.php
+++ b/tests/src/Kernel/EntityEmbedFilterTestBase.php
@@ -42,13 +42,6 @@ abstract class EntityEmbedFilterTestBase extends KernelTestBase {
     'user',
   ];
 
-  /**
-   * The renderer service.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
   /**
    * The sample Node entity to embed.
    *
@@ -86,8 +79,6 @@ abstract class EntityEmbedFilterTestBase extends KernelTestBase {
       ],
       'uuid' => 'e7a3e1fe-b69b-417e-8ee4-c80cb7640e63',
     ]);
-
-    $this->renderer = $this->container->get('renderer');
   }
 
   /**
@@ -178,7 +169,7 @@ abstract class EntityEmbedFilterTestBase extends KernelTestBase {
 
     $render_context = new RenderContext();
     /** @var \Drupal\filter\FilterProcessResult $filter_result */
-    $filter_result = $this->renderer->executeInRenderContext($render_context, function () use ($text, $filters, $langcode) {
+    $filter_result = $this->container->get('renderer')->executeInRenderContext($render_context, function () use ($text, $filters, $langcode) {
       $metadata = new BubbleableMetadata();
       foreach ($filters as $filter) {
         /** @var \Drupal\filter\FilterProcessResult $result */