diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
index 4750696..2679328 100644
--- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
@@ -10,7 +10,6 @@
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\user\RoleInterface;
-use Drupal\file\Entity\File;
 use Drupal\image\Entity\ImageStyle;
 
 /**
@@ -95,7 +94,7 @@ function _testImageFieldFormatters($scheme) {
     $node = $node_storage->load($nid);
 
     // Test that the default formatter is being used.
-    $file = File::load($node->{$field_name}->target_id);
+    $file = $node->{$field_name}->entity;
     $image_uri = $file->getFileUri();
     $image = array(
       '#theme' => 'image',
@@ -251,7 +250,7 @@ function testImageFieldSettings() {
     // style.
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $file = File::load($node->{$field_name}->target_id);
+    $file = $node->{$field_name}->entity;
     $image_style = array(
       '#theme' => 'image_style',
       '#uri' => $file->getFileUri(),
@@ -381,7 +380,7 @@ function testImageFieldDefaultImage() {
     $nid = $this->uploadNodeImage($images[1], $field_name, 'article', $alt);
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $file = File::load($node->{$field_name}->target_id);
+    $file = $node->{$field_name}->entity;
     $image = array(
       '#theme' => 'image',
       '#uri' => $file->getFileUri(),