diff -u b/core/modules/user/migration_templates/d7_user.yml b/core/modules/user/migration_templates/d7_user.yml
--- b/core/modules/user/migration_templates/d7_user.yml
+++ b/core/modules/user/migration_templates/d7_user.yml
@@ -27,5 +27,11 @@
+  user_picture: picture
 destination:
   plugin: entity:user
 migration_dependencies:
   required:
     - d7_user_role
+  optional:
+    - d7_file
+    - user_picture_field_instance
+    - user_picture_entity_display
+    - user_picture_entity_form_display
diff -u b/core/modules/user/src/Tests/Migrate/d7/UserMigrationBuilderTest.php b/core/modules/user/src/Tests/Migrate/d6/ProfileValuesBuilderTest.php
--- b/core/modules/user/src/Tests/Migrate/d7/UserMigrationBuilderTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/ProfileValuesBuilderTest.php
@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d7\UserMigrationBuilderTest.
+ * Contains \Drupal\user\Tests\Migrate\d6\ProfileValuesBuilderTest.
  */
 
-namespace Drupal\user\Tests\Migrate\d7;
+namespace Drupal\user\Tests\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * @group user
  */
-class UserMigrationBuilderTest extends MigrateDrupal7TestBase {
+class ProfileValuesBuilderTest extends MigrateDrupal6TestBase {
 
   public static $modules = ['migrate', 'migrate_drupal', 'user'];
 
@@ -22,15 +22,15 @@
    */
   public function testBuilder() {
     $template = \Drupal::service('migrate.template_storage')
-      ->getTemplateByName('d7_user');
+      ->getTemplateByName('d6_profile_values');
     /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */
     $migrations = \Drupal::service('plugin.manager.migrate.builder')
-      ->createInstance('d7_user')
+      ->createInstance('d6_profile_values')
       ->buildMigrations($template);
 
-    $this->assertIdentical('d7_user', $migrations[0]->id());
+    $this->assertIdentical('d6_profile_values', $migrations[0]->id());
     $process = $migrations[0]->getProcess();
-    $this->assertIdentical('field_file', $process['field_file'][0]['source']);
+    $this->assertIdentical('profile_color', $process['profile_color'][0]['source']);
   }
 
 }