diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php
index ce77a62..d86f7cd 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php
@@ -48,6 +48,11 @@ public function testUserPictureUpgrade() {
     $this->assertEqual($file->filemime, 'image/png');
     $this->assertFalse(empty($file->uuid));
 
+    // Check file usage for the default image.
+    $usage = file_usage()->listUsage($file);
+    $field = field_info_field('user_picture');
+    $this->assertEqual(1, $usage['image']['default_image'][$field['id']]);
+
     $this->assertEqual($instance['settings']['max_resolution'], '800x800', 'User picture maximum resolution has been migrated.');
     $this->assertEqual($instance['settings']['max_filesize'], '700 KB', 'User picture maximum filesize has been migrated.');
     $this->assertEqual($instance['description'], 'These are user picture guidelines.', 'User picture guidelines are now the user picture field description.');
diff --git a/core/modules/user/user.install b/core/modules/user/user.install
index 202b214..28511d3 100644
--- a/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -679,7 +679,20 @@ function user_update_8011() {
     'description' => update_variable_get('user_picture_guidelines', ''),
   );
 
-  _user_install_picture_field($settings);
+  $field = _user_install_picture_field($settings);
+
+  // Add file usage for the default field.
+  if (!empty($default_image_fid)) {
+    db_insert('file_usage')
+      ->fields(array(
+        'fid' => $default_image_fid,
+        'module' => 'image',
+        'type' => 'default_image',
+        'id' => $field['id'],
+        'count' => 1,
+      ))
+      ->execute();
+  }
 
   // Update the user bundle settings and hide the member_for extra field.
   $settings = update_variable_get('field_bundle_settings_user__user');
@@ -851,4 +864,5 @@ function _user_install_picture_field(array $settings = array()) {
     ),
   );
   _update_7000_field_create_instance($field, $instance);
+  return $field;
 }