diff --git a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php b/core/modules/image/src/Plugin/Filter/FilterImageStyle.php
index dffc408..a1bfd87 100644
--- a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php
+++ b/core/modules/image/src/Plugin/Filter/FilterImageStyle.php
@@ -187,7 +187,7 @@ protected function getImageInfo($file_uuid) {
    */
   protected function prepareImageAttributes(\DOMElement $dom_element) {
     // Make sure all non-regenerated attributes are retained.
-    $dom_element->removeAttribute('data-entity-type-file');
+    $dom_element->removeAttribute('data-entity-type');
     $dom_element->removeAttribute('data-entity-uuid');
     $dom_element->removeAttribute('data-image-style');
     $dom_element->removeAttribute('width');
diff --git a/core/modules/image/tests/src/Unit/FilterImageStyleTest.php b/core/modules/image/tests/src/Unit/FilterImageStyleTest.php
index 3f853f4..b6af52f 100644
--- a/core/modules/image/tests/src/Unit/FilterImageStyleTest.php
+++ b/core/modules/image/tests/src/Unit/FilterImageStyleTest.php
@@ -80,11 +80,11 @@ public function testProcessWithImage() {
     $original_img = '<img src="' . $original_src .'" width="' . $original_width .'" height="' . $original_height .'" alt="' . $original_alt .'" data-entity-uuid="' . $original_uuid . '" data-entity-type="file" data-image-style="' . $original_image_style . '" />';
     $original_text = '<p>' . $original_img . '</p>';
 
-    $generated_src = 'styles/medium/public/image.png';
+    $generated_src = 'styles/medium/public/inline-images/image.png';
     $generated_width = '200';
     $generated_height = '150';
 
-    $generated_img = '<img src="' . $generated_src .'" width="' . $generated_width .'" height="' . $generated_height .'" alt="' . $original_alt .'" data-entity-type="file" />';
+    $generated_img = '<img src="' . $generated_src .'" width="' . $generated_width .'" height="' . $generated_height .'" alt="' . $original_alt .'" />';
     $generated_text = '<p>' . $generated_img . '</p>';
 
     $this->filterImageStyle
diff --git a/core/modules/responsive_image/src/Plugin/Filter/FilterResponsiveImageStyle.php b/core/modules/responsive_image/src/Plugin/Filter/FilterResponsiveImageStyle.php
index fd47974..f1a999a 100644
--- a/core/modules/responsive_image/src/Plugin/Filter/FilterResponsiveImageStyle.php
+++ b/core/modules/responsive_image/src/Plugin/Filter/FilterResponsiveImageStyle.php
@@ -192,7 +192,7 @@ protected function getImageInfo($file_uuid) {
    */
   protected function prepareResponsiveImageAttributes(\DOMElement $dom_element) {
     // Make sure all non-regenerated attributes are retained.
-    $dom_element->removeAttribute('data-entity-type-file');
+    $dom_element->removeAttribute('data-entity-type');
     $dom_element->removeAttribute('data-entity-uuid');
     $dom_element->removeAttribute('data-responsive-image-style');
     $dom_element->removeAttribute('width');
diff --git a/core/modules/image/tests/src/Unit/FilterImageStyleTest.php b/core/modules/responsive_image/tests/src/Unit/FilterResponsiveImageStyleTest.php
similarity index 57%
copy from core/modules/image/tests/src/Unit/FilterImageStyleTest.php
copy to core/modules/responsive_image/tests/src/Unit/FilterResponsiveImageStyleTest.php
index 3f853f4..a01c8ac 100644
--- a/core/modules/image/tests/src/Unit/FilterImageStyleTest.php
+++ b/core/modules/responsive_image/tests/src/Unit/FilterResponsiveImageStyleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\image\Unit;
+namespace Drupal\Tests\responsive_image\Unit;
 
 use Drupal\Core\Entity\EntityRepository;
 use Drupal\Core\Entity\EntityStorageInterface;
@@ -8,13 +8,13 @@
 use Drupal\Core\Image\ImageFactory;
 use Drupal\Core\Render\Renderer;
 use Drupal\Tests\UnitTestCase;
-use Drupal\image\Plugin\Filter\FilterImageStyle;
+use Drupal\responsive_image\Plugin\Filter\FilterResponsiveImageStyle;
 
 /**
- * @coversDefaultClass \Drupal\image\Plugin\Filter\FilterImageStyle
+ * @coversDefaultClass \Drupal\responsive_image\Plugin\Filter\FilterResponsiveImageStyle
  * @group image
  */
-class FilterImageStyleTest extends UnitTestCase {
+class FilterResponsiveImageStyleTest extends UnitTestCase {
   protected $entityTypeManager;
   protected $entityRepository;
   protected $imageFactory;
@@ -26,9 +26,9 @@ class FilterImageStyleTest extends UnitTestCase {
   protected $filter;
 
   /**
-   * @var \Drupal\image\Plugin\Filter\FilterImageStyle
+   * @var \Drupal\responsive_image\Plugin\Filter\FilterResponsiveImageStyle
    */
-  protected $filterImageStyle;
+  protected $filterResponsiveImageStyle;
 
   /**
    * {@inheritdoc}
@@ -38,13 +38,13 @@ protected function setUp() {
 
     $configuration = [];
     $plugin_id = '';
-    $plugin_definition = ['provider' => 'image'];
+    $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);
 
-    $this->filterImageStyle = $this->getMockBuilder('Drupal\image\Plugin\Filter\FilterImageStyle')
+    $this->filterResponsiveImageStyle = $this->getMockBuilder('Drupal\responsive_image\Plugin\Filter\FilterResponsiveImageStyle')
       ->setConstructorArgs([
         $configuration,
         $plugin_id,
@@ -55,14 +55,14 @@ protected function setUp() {
         $this->renderer->reveal()
       ])
       ->setMethods([
-        'loadImageStyles',
-        'getImageStyleHtml'
+        'loadResponsiveImageStyles',
+        'getResponsiveImageStyleHtml'
       ])
       ->getMock();
   }
 
   public function testProcessWithoutImage() {
-    $output = $this->filterImageStyle->process('<a></a>', 'en');
+    $output = $this->filterResponsiveImageStyle->process('<a></a>', 'en');
     $this->assertEquals('<a></a>', $output);
   }
 
@@ -73,30 +73,30 @@ public function testProcessWithImage() {
     $original_src = 'image.png';
     $original_uuid = 'abcd-1234-ghij-5678';
     $original_image_style = 'medium';
+    $original_responsive_image_style = 'narrow';
     $original_width = '400';
     $original_height = '300';
     $original_alt = 'A wooly mammoth trumpets as a crevasse breaks open in the glacier.';
 
-    $original_img = '<img src="' . $original_src .'" width="' . $original_width .'" height="' . $original_height .'" alt="' . $original_alt .'" data-entity-uuid="' . $original_uuid . '" data-entity-type="file" data-image-style="' . $original_image_style . '" />';
+    $original_img = '<img src="' . $original_src .'" width="' . $original_width .'" height="' . $original_height .'" alt="' . $original_alt .'" data-entity-uuid="' . $original_uuid . '" data-entity-type="file" data-image-style="' . $original_image_style . '" data-responsive-image-style="' . $original_responsive_image_style . '" />';
     $original_text = '<p>' . $original_img . '</p>';
 
-    $generated_src = 'styles/medium/public/image.png';
-    $generated_width = '200';
-    $generated_height = '150';
+    $generated_src = 'styles/max_325x325/public/inline-images/image.png';
+    $generated_srcset = 'styles/max_325x325/public/inline-images/image.png 325w, styles/max_650x650/public/inline-images/image.png 650w, styles/max_1300x1300/public/inline-images/image.png 1300w';
+    $generated_sizes = '(min-width: 1290px) 325px, (min-width: 851px) 25vw, (min-width: 560px) 50vw, 100vw';
 
-    $generated_img = '<img src="' . $generated_src .'" width="' . $generated_width .'" height="' . $generated_height .'" alt="' . $original_alt .'" data-entity-type="file" />';
+    $generated_img = '<img srcset="' . $generated_srcset .'" sizes="' . $generated_sizes .'" src="' . $generated_src .'" alt="' . $original_alt .'" />';
     $generated_text = '<p>' . $generated_img . '</p>';
 
-    $this->filterImageStyle
-      ->method('loadImageStyles')
+    $this->filterResponsiveImageStyle
+      ->method('loadResponsiveImageStyles')
       ->willReturn([
-        'thumbnail',
-        'medium',
-        'large'
+        'narrow',
+        'wide'
       ]);
 
-    $this->filterImageStyle
-      ->method('getImageStyleHtml')
+    $this->filterResponsiveImageStyle
+      ->method('getResponsiveImageStyleHtml')
       ->with(
         $this->equalTo($original_uuid),
         $this->equalTo($original_image_style),
@@ -104,7 +104,7 @@ public function testProcessWithImage() {
       )
       ->willReturn($generated_img);
 
-    $output = $this->filterImageStyle->process($original_text, 'en');
+    $output = $this->filterResponsiveImageStyle->process($original_text, 'en');
     $this->assertEquals($generated_text, $output);
   }
 }