diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
index b73c06f..f006abd 100644
--- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
@@ -318,7 +318,7 @@ function testImageFieldDefaultImage() {
     $alt = $this->randomString(512);
     $title = $this->randomString(1024);
     $edit = array(
-      'files[field_storage_settings_default_image_fid]' => drupal_realpath($images[0]->uri),
+      'files[field_storage_settings_default_image_uuid]' => drupal_realpath($images[0]->uri),
       'field_storage[settings][default_image][alt]' => $alt,
       'field_storage[settings][default_image][title]' => $title,
     );
@@ -327,7 +327,7 @@ function testImageFieldDefaultImage() {
     \Drupal::entityManager()->clearCachedFieldDefinitions();
     $field_storage = FieldStorageConfig::loadByName('node', $field_name);
     $default_image = $field_storage->getSetting('default_image');
-    $file = file_load($default_image['fid']);
+    $file = \Drupal::entityManager()->loadEntityByUuid('file', $default_image['uuid']);
     $this->assertTrue($file->isPermanent(), 'The default image status is permanent.');
     $image = array(
       '#theme' => 'image',
@@ -363,21 +363,21 @@ function testImageFieldDefaultImage() {
 
     // Remove default image from the field and make sure it is no longer used.
     $edit = array(
-      'field_storage[settings][default_image][fid][fids]' => 0,
+      'field_storage[settings][default_image][uuid][fids]' => 0,
     );
     $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings'));
     // Clear field definition cache so the new default image is detected.
     \Drupal::entityManager()->clearCachedFieldDefinitions();
     $field_storage = FieldStorageConfig::loadByName('node', $field_name);
     $default_image = $field_storage->getSetting('default_image');
-    $this->assertFalse($default_image['fid'], 'Default image removed from field.');
+    $this->assertFalse($default_image['uuid'], 'Default image removed from field.');
     // Create an image field that uses the private:// scheme and test that the
     // default image works as expected.
     $private_field_name = strtolower($this->randomMachineName());
     $this->createImageField($private_field_name, 'article', array('uri_scheme' => 'private'));
     // Add a default image to the new field.
     $edit = array(
-      'files[field_storage_settings_default_image_fid]' => drupal_realpath($images[1]->uri),
+      'files[field_storage_settings_default_image_uuid]' => drupal_realpath($images[1]->uri),
       'field_storage[settings][default_image][alt]' => $alt,
       'field_storage[settings][default_image][title]' => $title,
     );
@@ -387,7 +387,7 @@ function testImageFieldDefaultImage() {
 
     $private_field_storage = FieldStorageConfig::loadByName('node', $private_field_name);
     $default_image = $private_field_storage->getSetting('default_image');
-    $file = file_load($default_image['fid']);
+    $file = \Drupal::entityManager()->loadEntityByUuid('file', $default_image['uuid']);
     $this->assertEqual('private', file_uri_scheme($file->getFileUri()), 'Default image uses private:// scheme.');
     $this->assertTrue($file->isPermanent(), 'The default image status is permanent.');
     // Create a new node with no image attached and ensure that default private
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php
index 2f1c179..e1ad519 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php
@@ -72,7 +72,7 @@ public function testFields() {
     $settings = $field_storage->getSettings();
     $this->assertEqual($settings['target_type'], 'file');
     $this->assertEqual($settings['uri_scheme'], 'public');
-    $this->assertEqual($settings['default_image']['fid'], '');
+    $this->assertEqual($settings['default_image']['uuid'], '');
     $this->assertEqual(array_filter($settings['default_image']), array());
 
     // Phone field.