diff --git a/core/modules/image/tests/src/Unit/FilterImageStyleTest.php b/core/modules/image/tests/src/Unit/FilterImageStyleTest.php
index 622bb29..ad1b047 100644
--- a/core/modules/image/tests/src/Unit/FilterImageStyleTest.php
+++ b/core/modules/image/tests/src/Unit/FilterImageStyleTest.php
@@ -15,10 +15,6 @@
  * @group image
  */
 class FilterImageStyleTest extends UnitTestCase {
-  protected $entityTypeManager;
-  protected $entityRepository;
-  protected $imageFactory;
-  protected $renderer;
 
   /**
    * @var \Drupal\filter\Plugin\Filter\FilterHtml
@@ -39,20 +35,20 @@ protected function setUp() {
     $configuration = [];
     $plugin_id = '';
     $plugin_definition = ['provider' => 'image'];
-    $this->entityTypeManager = $this->prophesize(EntityTypeManager::class);
-    $this->entityRepository = $this->prophesize(EntityRepository::class);
-    $this->imageFactory = $this->prophesize(ImageFactory::class);
-    $this->renderer = $this->prophesize(Renderer::class);
+    $entityTypeManager = $this->prophesize(EntityTypeManager::class);
+    $entityRepository = $this->prophesize(EntityRepository::class);
+    $imageFactory = $this->prophesize(ImageFactory::class);
+    $renderer = $this->prophesize(Renderer::class);
 
     $this->filterImageStyle = $this->getMockBuilder('Drupal\image\Plugin\Filter\FilterImageStyle')
       ->setConstructorArgs([
         $configuration,
         $plugin_id,
         $plugin_definition,
-        $this->entityTypeManager->reveal(),
-        $this->entityRepository->reveal(),
-        $this->imageFactory->reveal(),
-        $this->renderer->reveal()
+        $entityTypeManager->reveal(),
+        $entityRepository->reveal(),
+        $imageFactory->reveal(),
+        $renderer->reveal()
       ])
       ->setMethods([
         'loadImageStyles',
diff --git a/core/modules/responsive_image/tests/src/Unit/FilterResponsiveImageStyleTest.php b/core/modules/responsive_image/tests/src/Unit/FilterResponsiveImageStyleTest.php
index b6f8932..83c903c 100644
--- a/core/modules/responsive_image/tests/src/Unit/FilterResponsiveImageStyleTest.php
+++ b/core/modules/responsive_image/tests/src/Unit/FilterResponsiveImageStyleTest.php
@@ -15,10 +15,6 @@
  * @group image
  */
 class FilterResponsiveImageStyleTest extends UnitTestCase {
-  protected $entityTypeManager;
-  protected $entityRepository;
-  protected $imageFactory;
-  protected $renderer;
 
   /**
    * @var \Drupal\filter\Plugin\Filter\FilterHtml
@@ -39,20 +35,20 @@ protected function setUp() {
     $configuration = [];
     $plugin_id = '';
     $plugin_definition = ['provider' => 'responsive_image'];
-    $this->entityTypeManager = $this->prophesize(EntityTypeManager::class);
-    $this->entityRepository = $this->prophesize(EntityRepository::class);
-    $this->imageFactory = $this->prophesize(ImageFactory::class);
-    $this->renderer = $this->prophesize(Renderer::class);
+    $entityTypeManager = $this->prophesize(EntityTypeManager::class);
+    $entityRepository = $this->prophesize(EntityRepository::class);
+    $imageFactory = $this->prophesize(ImageFactory::class);
+    $renderer = $this->prophesize(Renderer::class);
 
     $this->filterResponsiveImageStyle = $this->getMockBuilder('Drupal\responsive_image\Plugin\Filter\FilterResponsiveImageStyle')
       ->setConstructorArgs([
         $configuration,
         $plugin_id,
         $plugin_definition,
-        $this->entityTypeManager->reveal(),
-        $this->entityRepository->reveal(),
-        $this->imageFactory->reveal(),
-        $this->renderer->reveal()
+        $entityTypeManager->reveal(),
+        $entityRepository->reveal(),
+        $imageFactory->reveal(),
+        $renderer->reveal()
       ])
       ->setMethods([
         'loadResponsiveImageStyles',