diff --git a/core/modules/user/src/Plugin/migrate/process/d6/UserPicture.php b/core/modules/user/src/Plugin/migrate/process/d6/UserPicture.php
index 8438092..0b3d8ff 100644
--- a/core/modules/user/src/Plugin/migrate/process/d6/UserPicture.php
+++ b/core/modules/user/src/Plugin/migrate/process/d6/UserPicture.php
@@ -57,7 +57,12 @@ public static function create(ContainerInterface $container, array $configuratio
    * {@inheritdoc}
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    return $row->getSourceProperty('picture') ? $this->migrationPlugin->transform($value, $migrate_executable, $row, $destination_property) : NULL;
+    $fname = basename($row->getSourceProperty('picture'));
+    $fids = \Drupal::entityQuery('file')
+      ->condition('uid', $value, '=')
+      ->condition('filename', $fname, 'LIKE')
+      ->execute();
+    return (count($fids) == 1) ? reset($fids) : NULL;
   }
 
 }
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
index 7fa3236..82dc729 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
@@ -60,7 +60,7 @@ protected function setUp() {
     ))->save();
 
     $file = entity_create('file', array(
-      'fid' => 2,
+      'fid' => 12,
       'uid' => 2,
       'filename' => 'image-test.jpg',
       'uri' => "public://image-test.jpg",
@@ -74,7 +74,7 @@ protected function setUp() {
     $file->save();
 
     $file = entity_create('file', array(
-      'fid' => 8,
+      'fid' => 18,
       'uid' => 8,
       'filename' => 'image-test.png',
       'uri' => "public://image-test.png",