diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
index 614725d966..e49f607fd4 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
@@ -32,9 +32,9 @@ protected function setUp() {
    */
~
   public function testTermRevisionNode() {
~
     $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2);
~
     $this->
-assertSame
+assertIdentical
 (2, count($node->field_vocabulary_3_i_2_));
~
     $this->
-assertSame
+assertIdentical
 ('4', $node->field_vocabulary_3_i_2_[0]->target_id);
~
     $this->
-assertSame
+assertIdentical
 ('5', $node->field_vocabulary_3_i_2_[1]->target_id);
~
   }
~
 
~
 }
~
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
index 8e7d13de0e..16258008e0 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
@@ -40,12 +40,12 @@ public function testTermNode() {
 
~
     $nodes = Node::loadMultiple([1, 2]);
~
     $node = $nodes[1];
~
     $this->
-assertSame
+assertIdentical
 (1, count($node->field_vocabulary_1_i_0_));
~
     $this->
-assertSame
+assertIdentical
 ('1', $node->field_vocabulary_1_i_0_[0]->target_id);
~
     $node = $nodes[2];
~
     $this->
-assertSame
+assertIdentical
 (2, count($node->field_vocabulary_2_i_1_));
~
     $this->
-assertSame
+assertIdentical
 ('2', $node->field_vocabulary_2_i_1_[0]->target_id);
~
     $this->
-assertSame
+assertIdentical
 ('3', $node->field_vocabulary_2_i_1_[1]->target_id);
~
   }
~
 
~
   /**
~
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
index d6d19c09c3..1a85aaae15 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
@@ -42,10 +42,10 @@ public function testVocabularyEntityDisplay() {
 
~
     // Test that the field exists.
~
     $component = EntityViewDisplay::load('node.page.default')->getComponent('field_tags');
~
     $this->
-assertSame
+assertIdentical
 ('entity_reference_label', $component['type']);
~
     $this->
-assertSame
+assertIdentical
 (20, $component['weight']);
~
     // Test the Id map.
~
     $this->
-assertSame
+assertIdentical
 (['node', 'article', 'default', 'field_tags'], $this->getMigration('d6_vocabulary_entity_display')->getIdMap()->lookupDestinationID([4, 'article']));
~
   }
~
 
~
   /**
~
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
index a6886633db..c322982129 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
@@ -42,15 +42,15 @@ public function testVocabularyEntityFormDisplay() {
 
~
     // Test that the field exists.
~
     $component = EntityFormDisplay::load('node.page.default')->getComponent('field_tags');
~
     $this->
-assertSame
+assertIdentical
 ('options_select', $component['type']);
~
     $this->
-assertSame
+assertIdentical
 (20, $component['weight']);
~
     // Test the Id map.
~
     $this->
-assertSame
+assertIdentical
 (['node', 'article', 'default', 'field_tags'], $this->getMigration('d6_vocabulary_entity_form_display')->getIdMap()->lookupDestinationID([4, 'article']));
~
 
~
     // Test the term widget tags setting.
~
     $entity_form_display = EntityFormDisplay::load('node.story.default');
~
     $this->
-assertSame
+assertIdentical
 ($entity_form_display->getComponent('field_vocabulary_1_i_0_')['type'], 'options_select');
~
     $this->
-assertSame
+assertIdentical
 ($entity_form_display->getComponent('field_vocabulary_2_i_1_')['type'], 'entity_reference_autocomplete_tags');
~
   }
~
 
~
   /**
~