diff --git a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
index 9339fec..46dd338 100644
--- a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
+++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
@@ -62,7 +62,7 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
   public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, FileStorageInterface $file_storage, EntityStorageInterface $responsive_image_style_storage) {
     parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings, $file_storage);
 
-    $this->responsiveImageMappingStorage = $responsive_image_mapping_storage;
+    $this->responsiveImageStyleStorage = $responsive_image_style_storage;
   }
 
   /**
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
index e31d0ba..74d4dbd 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
@@ -172,7 +172,8 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles =
     $node = $node_storage->load($nid);
 
     // Test that the default formatter is being used.
-    $image_uri = File::load($node->{$field_name}->target_id)->getFileUri();
+    $file_storage = $this->container->get('entity.manager')->getStorage('file');
+    $image_uri = $file_storage->load($node->{$field_name}->target_id)->getFileUri();
     $image = array(
       '#theme' => 'image',
       '#uri' => $image_uri,