diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6User.php b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6User.php
index f8892c3..601248e 100644
--- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6User.php
+++ b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6User.php
@@ -447,7 +447,7 @@ public static function getData($table) {
       ),
       'profile_values' => array(
         array('fid' => 8, 'uid' => 2, 'value' => 'red'),
-        array('fid' => 9, 'uid' => 2, 'value' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nulla sapien, congue nec risus ut, adipiscing aliquet felis. Maecenas quis justo vel nulla varius euismod. Quisque metus metus, cursus sit amet sem non, bibendum vehicula elit. Cras dui nisl, eleifend at iaculis vitae, lacinia ut felis. Nullam aliquam ligula volutpat nulla consectetur accumsan. Maecenas tincidunt molestie diam, a accumsan enim fringilla sit amet. Morbi a tincidunt tellus. Donec imperdiet scelerisque porta. Sed quis sem bibendum eros congue sodales. Vivamus vel fermentum est, at rutrum orci. Nunc consectetur purus ut dolor pulvinar, ut volutpat felis congue. Cras tincidunt odio sed neque sollicitudin, vehicula tempor metus scelerisque.'),
+        array('fid' => 9, 'uid' => 2, 'value' => 'Lorem\ipsum/dolor sit amet, consectetur adipiscing elit. Nam nulla sapien, congue nec risus ut, adipiscing aliquet felis. Maecenas quis justo vel nulla varius euismod. Quisque metus metus, cursus sit amet sem non, bibendum vehicula elit. Cras dui nisl, eleifend at iaculis vitae, lacinia ut felis. Nullam aliquam ligula volutpat nulla consectetur accumsan. Maecenas tincidunt molestie diam, a accumsan enim fringilla sit amet. Morbi a tincidunt tellus. Donec imperdiet scelerisque porta. Sed quis sem bibendum eros congue sodales. Vivamus vel fermentum est, at rutrum orci. Nunc consectetur purus ut dolor pulvinar, ut volutpat felis congue. Cras tincidunt odio sed neque sollicitudin, vehicula tempor metus scelerisque.'),
         array('fid' => 10, 'uid' => 2, 'value' => '1'),
         array('fid' => 11, 'uid' => 2, 'value' => 'Fitness spammers'),
         array('fid' => 12, 'uid' => 2, 'value' => "AC/DC\n,,Eagles\r\nElton John,Lemonheads\r\n\r\nRolling Stones\rQueen\nThe White Stripes"),
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
index cb4268c..e8e3445 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
@@ -258,7 +258,7 @@ protected function getTestClassesList() {
       __NAMESPACE__ . '\MigrateNodeRevisionTest',
       __NAMESPACE__ . '\MigrateNodeTest',
       __NAMESPACE__ . '\MigrateNodeTypeTest',
-      __NAMESPACE__ . '\MigrateProfileValuesTest',
+      __NAMESPACE__ . '\MigrateUserProfileValuesTest',
       __NAMESPACE__ . '\MigrateSearchConfigsTest',
       __NAMESPACE__ . '\MigrateSearchPageTest',
       __NAMESPACE__ . '\MigrateSimpletestConfigsTest',
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileValuesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileValuesTest.php
index 00dbce1..5d33697 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileValuesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileValuesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateProfileValuesTest.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateUserProfileValuesTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
@@ -18,7 +18,7 @@
  *
  * @group migrate_drupal
  */
-class MigrateProfileValuesTest extends MigrateDrupalTestBase {
+class MigrateUserProfileValuesTest extends MigrateDrupalTestBase {
 
   /**
    * The modules to be enabled during the test.
@@ -145,7 +145,7 @@ public function testUserProfileValues() {
     $user = User::load(2);
     $this->assertFalse(is_null($user));
     $this->assertEqual($user->profile_color->value, 'red');
-    $this->assertEqual($user->profile_biography->value, 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nulla sapien, congue nec risus ut, adipiscing aliquet felis. Maecenas quis justo vel nulla varius euismod. Quisque metus metus, cursus sit amet sem non, bibendum vehicula elit. Cras dui nisl, eleifend at iaculis vitae, lacinia ut felis. Nullam aliquam ligula volutpat nulla consectetur accumsan. Maecenas tincidunt molestie diam, a accumsan enim fringilla sit amet. Morbi a tincidunt tellus. Donec imperdiet scelerisque porta. Sed quis sem bibendum eros congue sodales. Vivamus vel fermentum est, at rutrum orci. Nunc consectetur purus ut dolor pulvinar, ut volutpat felis congue. Cras tincidunt odio sed neque sollicitudin, vehicula tempor metus scelerisque.');
+    $this->assertEqual($user->profile_biography->value, 'Lorem\ipsum/dolor sit amet, consectetur adipiscing elit. Nam nulla sapien, congue nec risus ut, adipiscing aliquet felis. Maecenas quis justo vel nulla varius euismod. Quisque metus metus, cursus sit amet sem non, bibendum vehicula elit. Cras dui nisl, eleifend at iaculis vitae, lacinia ut felis. Nullam aliquam ligula volutpat nulla consectetur accumsan. Maecenas tincidunt molestie diam, a accumsan enim fringilla sit amet. Morbi a tincidunt tellus. Donec imperdiet scelerisque porta. Sed quis sem bibendum eros congue sodales. Vivamus vel fermentum est, at rutrum orci. Nunc consectetur purus ut dolor pulvinar, ut volutpat felis congue. Cras tincidunt odio sed neque sollicitudin, vehicula tempor metus scelerisque.');
     $this->assertEqual($user->profile_sell_address->value, '1');
     $this->assertEqual($user->profile_sold_to->value, 'Fitness spammers');
     $this->assertEqual($user->profile_bands[0]->value, 'AC/DC');
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php
index 82f60f0..4a187bc 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
+use Drupal\user\Entity\User;
+use Drupal\file\Entity\File;
 use Drupal\Core\Database\Database;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
@@ -151,7 +153,7 @@ public function testUser() {
       $migration_format = entity_load('migration', 'd6_filter_format');
       $signature_format = $migration_format->getIdMap()->lookupDestinationId(array($source->signature_format));
 
-      $user = user_load($source->uid);
+      $user = User::load($source->uid);
       $this->assertEqual($user->id(), $source->uid);
       $this->assertEqual($user->label(), $source->name);
       $this->assertEqual($user->getEmail(), $source->mail);
@@ -174,7 +176,7 @@ public function testUser() {
       // We have one empty picture in the data so don't try load that.
       if (!empty($source->picture)) {
         // Test the user picture.
-        $file = file_load($user->user_picture->target_id);
+        $file = File::load($user->user_picture->target_id);
         $this->assertEqual($file->getFilename(), basename($source->picture));
       }