diff -u b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemDateTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemDateTest.php --- b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemDateTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemDateTest.php @@ -21,7 +21,6 @@ */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_system_date'); } diff -u b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php --- b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php @@ -151,8 +151,8 @@ // user preferred language is not configured on the site. We just want to // test if the value was imported correctly. $this->assertIdentical($source->language, $user->preferred_langcode->value); - $time_zone = $source->expected_timezone ?: $this->config('system.date')->get('timezone.default'); - $this->assertIdentical($time_zone, $user->getTimeZone()); + $expected_timezone_name = $source->timezone_name ?: $this->config('system.date')->get('timezone.default'); + $this->assertIdentical($expected_timezone_name, $user->getTimeZone()); $this->assertIdentical($source->init, $user->getInitialEmail()); $this->assertIdentical($roles, $user->getRoles()); @@ -164,8 +164,8 @@ // user preferred language is not configured on the site. We just want to // test if the value was imported correctly. $this->assertIdentical($source->language, $user->preferred_langcode->value); - $expected_timezone_name = $source->timezone_name ?: $this->config('system.date')->get('timezone.default'); - $this->assertIdentical($expected_timezone_name, $user->getTimeZone()); + $time_zone = $source->expected_timezone ?: $this->config('system.date')->get('timezone.default'); + $this->assertIdentical($time_zone, $user->getTimeZone()); $this->assertIdentical($source->init, $user->getInitialEmail()); $this->assertIdentical($roles, $user->getRoles());