diff --git a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
index c5dfba2..288d1a3 100644
--- a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
+++ b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\block\Kernel\Migrate\d6;
 
 use Drupal\block\Entity\Block;
+use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
@@ -102,7 +103,7 @@ public function testBlockMigration() {
     $this->assertEntity('user', $visibility, 'sidebar_first', 'bartik', 0, '', '0');
 
     $visibility = [];
-    $this->assertEntity('user_1', $visibility, 'sidebar_first', 'bartik', 0, '', '0');
+    $this->assertEntity('user_1', $visibility, 'sidebar_first', 'bartik', 0, 'zu - Test Title 02', BlockPluginInterface::BLOCK_LABEL_VISIBLE);
 
     $visibility['user_role']['id'] = 'user_role';
     $roles['authenticated'] = 'authenticated';
@@ -131,7 +132,7 @@ public function testBlockMigration() {
 
     // Check menu blocks
     $visibility = [];
-    $this->assertEntity('menu', $visibility, 'header', 'bartik', -5, '', '0');
+    $this->assertEntity('menu', $visibility, 'header', 'bartik', -5, 'fr - primary', BlockPluginInterface::BLOCK_LABEL_VISIBLE);
 
     // Check custom blocks
     $visibility['request_path']['id'] = 'request_path';
diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
index e634acd..ec9b23c 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal6.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
@@ -44406,6 +44406,12 @@
   'language',
 ))
 ->values(array(
+  'pid' => '1',
+  'src' => 'node/1',
+  'dst' => 'alias-one',
+  'language' => 'af',
+))
+->values(array(
   'pid' => '2',
   'src' => 'node/2',
   'dst' => 'alias-two',
@@ -46197,7 +46203,7 @@
   'description' => 'description of vocabulary 1 (i=0)',
   'help' => '',
   'relations' => '1',
-  'hierarchy' => '1',
+  'hierarchy' => '0',
   'multiple' => '0',
   'required' => '0',
   'tags' => '0',
@@ -46211,7 +46217,7 @@
   'description' => 'description of vocabulary 2 (i=1)',
   'help' => '',
   'relations' => '1',
-  'hierarchy' => '0',
+  'hierarchy' => '1',
   'multiple' => '1',
   'required' => '0',
   'tags' => '1',
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
index b0311f3..28c78ef 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
@@ -36,18 +36,21 @@ public function testTaxonomyTerms() {
         'vid' => 'vocabulary_1_i_0_',
         'weight' => 0,
         'parent' => array(0),
+        'language' => 'zu',
       ),
       '2' => array(
         'source_vid' => 2,
         'vid' => 'vocabulary_2_i_1_',
         'weight' => 3,
         'parent' => array(0),
+        'language' => 'fr',
       ),
       '3' => array(
         'source_vid' => 2,
         'vid' => 'vocabulary_2_i_1_',
         'weight' => 4,
         'parent' => array(2),
+        'language' => 'fr',
       ),
       '4' => array(
         'source_vid' => 3,
@@ -83,8 +86,9 @@ public function testTaxonomyTerms() {
     foreach ($expected_results as $tid => $values) {
       /** @var Term $term */
       $term = $terms[$tid];
-      $this->assertIdentical("term {$tid} of vocabulary {$values['source_vid']}", $term->name->value);
-      $this->assertIdentical("description of term {$tid} of vocabulary {$values['source_vid']}", $term->description->value);
+      $language = isset($values['language']) ? $values['language'] . ' - ' : '';
+      $this->assertIdentical("{$language}term {$tid} of vocabulary {$values['source_vid']}", $term->name->value);
+      $this->assertIdentical("{$language}description of term {$tid} of vocabulary {$values['source_vid']}", $term->description->value);
       $this->assertIdentical($values['vid'], $term->vid->target_id);
       $this->assertIdentical((string) $values['weight'], $term->weight->value);
       if ($values['parent'] === array(0)) {