diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php
@@ -45,13 +45,13 @@
     $this->assertIdentical($feed->language()->getId(), 'en');
     $this->assertIdentical($feed->url->value, 'http://knowyourmeme.com/newsfeed.rss');
-    $this->assertEqual($feed->refresh->value, 900);
-    $this->assertEqual($feed->checked->value, 1387659487);
-    $this->assertEqual($feed->queued->value, 0);
+    $this->assertIdentical($feed->refresh->value, '900');
+    $this->assertIdentical($feed->checked->value, '1387659487');
+    $this->assertIdentical($feed->queued->value, '0');
     $this->assertIdentical($feed->link->value, 'http://knowyourmeme.com');
     $this->assertIdentical($feed->description->value, 'New items added to the News Feed');
     $this->assertIdentical($feed->image->value, 'http://b.thumbs.redditmedia.com/harEHsUUZVajabtC.png');
-    $this->assertEqual($feed->hash->value, '');
+    $this->assertNULL($feed->hash->value);
     $this->assertIdentical($feed->etag->value, '"213cc1365b96c310e92053c5551f0504"');
-    $this->assertEqual($feed->modified->value, 0);
+    $this->assertIdentical($feed->modified->value, '0');
   }
 }
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php
@@ -60,13 +60,13 @@
   public function testAggregatorItem() {
     /** @var Item $item */
     $item = Item::load(1);
-    $this->assertEqual($item->id(), 1);
-    $this->assertEqual($item->getFeedId(), 5);
+    $this->assertIdentical($item->id(), '1');
+    $this->assertIdentical($item->getFeedId(), '5');
     $this->assertIdentical($item->label(), 'This (three) weeks in Drupal Core - January 10th 2014');
     $this->assertIdentical($item->getAuthor(), 'larowlan');
     $this->assertIdentical($item->getDescription(), "<h2 id='new'>What's new with Drupal 8?</h2>");
     $this->assertIdentical($item->getLink(), 'https://groups.drupal.org/node/395218');
-    $this->assertEqual($item->getPostedTime(), 1389297196);
+    $this->assertIdentical($item->getPostedTime(), '1389297196');
     $this->assertIdentical($item->language()->getId(), 'en');
     $this->assertIdentical($item->getGuid(), '395218 at https://groups.drupal.org');
 
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
@@ -57,7 +57,7 @@
     /** @var BlockContent $block */
     $block = entity_load('block_content', 1);
     $this->assertIdentical('My block 1', $block->label());
-    $this->assertEqual(1, $block->getRevisionId());
+    $this->assertIdentical('1', $block->getRevisionId());
     $this->assertTrue(REQUEST_TIME <= $block->getChangedTime() && $block->getChangedTime() <= time());
     $this->assertIdentical('en', $block->language()->getId());
     $this->assertIdentical('<h3>My first custom block body</h3>', $block->body->value);
@@ -65,7 +65,7 @@
 
     $block = entity_load('block_content', 2);
     $this->assertIdentical('My block 2', $block->label());
-    $this->assertEqual(2, $block->getRevisionId());
+    $this->assertIdentical('2', $block->getRevisionId());
     $this->assertTrue(REQUEST_TIME <= $block->getChangedTime() && $block->getChangedTime() <= time());
     $this->assertIdentical('en', $block->language()->getId());
     $this->assertIdentical('<h3>My second custom block body</h3>', $block->body->value);
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
@@ -135,9 +135,9 @@
   public function testCckFields() {
     $node = Node::load(1);
     $this->assertIdentical($node->field_test->value, 'This is a shared text field', "Shared field storage field is correct.");
-    $this->assertEqual($node->field_test->format, 1, "Shared field storage field with multiple columns is correct.");
-    $this->assertEqual($node->field_test_two->value, 10, 'Multi field storage field is correct');
-    $this->assertEqual($node->field_test_two[1]->value, 20, 'Multi field second value is correct.');
+    $this->assertIdentical($node->field_test->format, '1', "Shared field storage field with multiple columns is correct.");
+    $this->assertIdentical($node->field_test_two->value, '10', 'Multi field storage field is correct');
+    $this->assertIdentical($node->field_test_two[1]->value, '20', 'Multi field second value is correct.');
     $this->assertIdentical($node->field_test_three->value, '42.42', 'Single field second value is correct.');
     $this->assertIdentical($node->field_test_integer_selectlist[0]->value, '3412', 'Integer select list value is correct');
     $this->assertIdentical($node->field_test_identical1->value, '1', 'Integer value is correct');
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
@@ -75,17 +75,17 @@
     $this->assertIdentical('The first comment body.', $comment->comment_body->value);
     $this->assertIdentical('filtered_html', $comment->comment_body->format);
-    $this->assertEqual(0, $comment->pid->target_id);
-    $this->assertEqual(1, $comment->getCommentedEntityId());
+    $this->assertIdentical('0', $comment->pid->target_id);
+    $this->assertIdentical('1', $comment->getCommentedEntityId());
     $this->assertIdentical('node', $comment->getCommentedEntityTypeId());
     $this->assertIdentical('en', $comment->language()->getId());
     $this->assertIdentical('comment_no_subject', $comment->getTypeId());
 
     $comment = entity_load('comment', 2);
     $this->assertIdentical('The response to the second comment.', $comment->subject->value);
-    $this->assertEqual(3, $comment->pid->target_id);
+    $this->assertIdentical('3', $comment->pid->target_id);
 
     $comment = entity_load('comment', 3);
     $this->assertIdentical('The second comment.', $comment->subject->value);
-    $this->assertEqual(0, $comment->pid->target_id);
+    $this->assertIdentical('0', $comment->pid->target_id);
   }
 }
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php
@@ -71,7 +71,7 @@
     $this->assertIdentical($settings['default_mode'], 4);
     $this->assertIdentical($settings['per_page'], 50);
     $this->assertIdentical($settings['anonymous'], 0);
-    $this->assertEqual($settings['form_location'], 0);
+    $this->assertIdentical($settings['form_location'], FALSE);
     $this->assertIdentical($settings['preview'], 1);
 
     $node = entity_create('node', array('type' => 'story'));
@@ -81,7 +81,7 @@
     $this->assertIdentical($settings['default_mode'], 2);
     $this->assertIdentical($settings['per_page'], 70);
     $this->assertIdentical($settings['anonymous'], 1);
-    $this->assertEqual($settings['form_location'], 0);
+    $this->assertIdentical($settings['form_location'], FALSE);
     $this->assertIdentical($settings['preview'], 0);
   }
 
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php
@@ -72,7 +72,7 @@
     $settings = $field_storage->getSettings();
     $this->assertIdentical($settings['target_type'], 'file');
     $this->assertIdentical($settings['uri_scheme'], 'public');
-    $this->assertEqual($settings['default_image']['fid'], '');
+    $this->assertNull($settings['default_image']['fid']);
     $this->assertIdentical(array_filter($settings['default_image']), array());
 
     // Phone field.
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
@@ -48,7 +48,7 @@
     /** @var \Drupal\file\FileInterface $file */
     $file = entity_load('file', 1);
     $this->assertIdentical($file->getFilename(), 'Image1.png');
-    $this->assertEqual($file->getSize(), 39325);
+    $this->assertIdentical($file->getSize(), '39325');
     $this->assertIdentical($file->getFileUri(), 'public://image-1.png');
     $this->assertIdentical($file->getMimeType(), 'image/png');
     // It is pointless to run the second half from MigrateDrupal6Test.
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php
@@ -51,20 +51,20 @@
   public function testNodeRevision() {
     $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2);
     /** @var \Drupal\node\NodeInterface $node */
-    $this->assertEqual($node->id(), 1);
-    $this->assertEqual($node->getRevisionId(), 2);
+    $this->assertIdentical($node->id(), '1');
+    $this->assertIdentical($node->getRevisionId(), '2');
     $this->assertIdentical($node->langcode->value, 'und');
     $this->assertIdentical($node->getTitle(), 'Test title rev 2');
     $this->assertIdentical($node->body->value, 'body test rev 2');
     $this->assertIdentical($node->body->summary, 'teaser test rev 2');
-    $this->assertEqual($node->getRevisionAuthor()->id(), 2);
+    $this->assertIdentical($node->getRevisionAuthor()->id(), '2');
     $this->assertIdentical($node->revision_log->value, 'modified rev 2');
     $this->assertIdentical($node->getRevisionCreationTime(), '1390095702');
 
     $node = \Drupal::entityManager()->getStorage('node')->loadRevision(5);
-    $this->assertEqual($node->id(), 1);
+    $this->assertIdentical($node->id(), '1');
     $this->assertIdentical($node->body->value, 'body test rev 3');
-    $this->assertEqual($node->getRevisionAuthor()->id(), 1);
+    $this->assertIdentical($node->getRevisionAuthor()->id(), '1');
     $this->assertIdentical($node->revision_log->value, 'modified rev 3');
     $this->assertIdentical($node->getRevisionCreationTime(), '1390095703');
   }
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
@@ -38,22 +38,22 @@
    */
   public function testNode() {
     $node = Node::load(1);
-    $this->assertEqual($node->id(), 1, 'Node 1 loaded.');
+    $this->assertIdentical($node->id(), '1', 'Node 1 loaded.');
     $this->assertIdentical($node->langcode->value, 'und');
     $this->assertIdentical($node->body->value, 'test');
     $this->assertIdentical($node->body->summary, 'test');
     $this->assertIdentical($node->body->format, 'filtered_html');
     $this->assertIdentical($node->getType(), 'story', 'Node has the correct bundle.');
     $this->assertIdentical($node->getTitle(), 'Test title', 'Node has the correct title.');
-    $this->assertEqual($node->getCreatedTime(), 1388271197, 'Node has the correct created time.');
+    $this->assertIdentical($node->getCreatedTime(), '1388271197', 'Node has the correct created time.');
     $this->assertIdentical($node->isSticky(), FALSE);
-    $this->assertEqual($node->getOwnerId(), 1);
-    $this->assertEqual($node->getRevisionCreationTime(), 1390095701, 'Node has the correct revision timestamp.');
+    $this->assertIdentical($node->getOwnerId(), '1');
+    $this->assertIdentical($node->getRevisionCreationTime(), '1390095701', 'Node has the correct revision timestamp.');
 
     /** @var \Drupal\node\NodeInterface $node_revision */
     $node_revision = \Drupal::entityManager()->getStorage('node')->loadRevision(1);
     $this->assertIdentical($node_revision->getTitle(), 'Test title');
-    $this->assertEqual($node_revision->getRevisionAuthor()->id(), 1, 'Node revision has the correct user');
+    $this->assertIdentical($node_revision->getRevisionAuthor()->id(), '1', 'Node revision has the correct user');
     // This is empty on the first revision.
     $this->assertEqual($node_revision->revision_log->value, '');
 
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyTermTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyTermTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyTermTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyTermTest.php
@@ -91,9 +91,9 @@
       $this->assertIdentical($term->name->value, "term {$tid} of vocabulary {$values['source_vid']}");
       $this->assertIdentical($term->description->value, "description of term {$tid} of vocabulary {$values['source_vid']}");
       $this->assertIdentical($term->vid->target_id, $values['vid']);
-      $this->assertEqual($term->weight->value, $values['weight']);
+      $this->assertIdentical($term->weight->value, (string) $values['weight']);
       if ($values['parent'] === array(0)) {
-        $this->assertEqual($term->parent->target_id, 0);
+        $this->assertNull($term->parent->target_id);
       }
       else {
         $parents = array();
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php
@@ -44,8 +44,8 @@
   public function testTermRevisionNode() {
     $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2);
     $this->assertIdentical(count($node->vocabulary_3_i_2_), 2);
-    $this->assertEqual($node->vocabulary_3_i_2_[0]->target_id, 4);
-    $this->assertEqual($node->vocabulary_3_i_2_[1]->target_id, 5);
+    $this->assertIdentical($node->vocabulary_3_i_2_[0]->target_id, '4');
+    $this->assertIdentical($node->vocabulary_3_i_2_[1]->target_id, '5');
   }
 
 }
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTest.php
@@ -39,11 +39,11 @@
     $nodes = Node::loadMultiple(array(1, 2));
     $node = $nodes[1];
     $this->assertIdentical(count($node->vocabulary_1_i_0_), 1);
-    $this->assertEqual($node->vocabulary_1_i_0_[0]->target_id, 1);
+    $this->assertIdentical($node->vocabulary_1_i_0_[0]->target_id, '1');
     $node = $nodes[2];
     $this->assertIdentical(count($node->vocabulary_2_i_1_), 2);
-    $this->assertEqual($node->vocabulary_2_i_1_[0]->target_id, 2);
-    $this->assertEqual($node->vocabulary_2_i_1_[1]->target_id, 3);
+    $this->assertIdentical($node->vocabulary_2_i_1_[0]->target_id, '2');
+    $this->assertIdentical($node->vocabulary_2_i_1_[1]->target_id, '3');
   }
 
 }
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadTest.php
@@ -37,16 +37,16 @@
     $nodes = Node::loadMultiple(array(1, 2));
     $node = $nodes[1];
     $this->assertIdentical(count($node->upload), 1);
-    $this->assertEqual($node->upload[0]->target_id, 1);
+    $this->assertIdentical($node->upload[0]->target_id, '1');
     $this->assertIdentical($node->upload[0]->description, 'file 1-1-1');
     $this->assertIdentical($node->upload[0]->isDisplayed(), FALSE);
 
     $node = $nodes[2];
     $this->assertIdentical(count($node->upload), 2);
-    $this->assertEqual($node->upload[0]->target_id, 3);
+    $this->assertIdentical($node->upload[0]->target_id, '3');
     $this->assertIdentical($node->upload[0]->description, 'file 2-3-3');
     $this->assertIdentical($node->upload[0]->isDisplayed(), FALSE);
-    $this->assertEqual($node->upload[1]->target_id, 2);
+    $this->assertIdentical($node->upload[1]->target_id, '2');
     $this->assertIdentical($node->upload[1]->isDisplayed(), TRUE);
     $this->assertIdentical($node->upload[1]->description, 'file 2-3-2');
   }
diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
--- b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
@@ -53,7 +53,7 @@
     $file = array_shift($files);
     $this->assertIdentical($file->getFilename(), 'image-test.jpg');
     $this->assertIdentical($file->getFileUri(), 'public://image-test.jpg');
-    $this->assertEqual($file->getSize(), 1901);
+    $this->assertIdentical($file->getSize(), '1901');
     $this->assertIdentical($file->getMimeType(), 'image/jpeg');
 
     $file = array_shift($files);
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php
@@ -54,26 +54,26 @@ protected function setUp() {
    */
   public function testBook() {
     $nodes = Node::loadMultiple(array(4, 5, 6, 7, 8));
-    $this->assertEqual($nodes[4]->book['bid'], 4);
-    $this->assertEqual($nodes[4]->book['pid'], 0);
+    $this->assertIdentical($nodes[4]->book['bid'], '4');
+    $this->assertIdentical($nodes[4]->book['pid'], '0');
 
-    $this->assertEqual($nodes[5]->book['bid'], 4);
-    $this->assertEqual($nodes[5]->book['pid'], 4);
+    $this->assertIdentical($nodes[5]->book['bid'], '4');
+    $this->assertIdentical($nodes[5]->book['pid'], '4');
 
-    $this->assertEqual($nodes[6]->book['bid'], 4);
-    $this->assertEqual($nodes[6]->book['pid'], 5);
+    $this->assertIdentical($nodes[6]->book['bid'], '4');
+    $this->assertIdentical($nodes[6]->book['pid'], '5');
 
-    $this->assertEqual($nodes[7]->book['bid'], 4);
-    $this->assertEqual($nodes[7]->book['pid'], 5);
+    $this->assertIdentical($nodes[7]->book['bid'], '4');
+    $this->assertIdentical($nodes[7]->book['pid'], '5');
 
-    $this->assertEqual($nodes[8]->book['bid'], 8);
-    $this->assertEqual($nodes[8]->book['pid'], 0);
+    $this->assertIdentical($nodes[8]->book['bid'], '8');
+    $this->assertIdentical($nodes[8]->book['pid'], '0');
 
     $tree = \Drupal::service('book.manager')->bookTreeAllData(4);
-    $this->assertEqual($tree['49990 Node 4 4']['link']['nid'], 4);
-    $this->assertEqual($tree['49990 Node 4 4']['below']['50000 Node 5 5']['link']['nid'], 5);
-    $this->assertEqual($tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 6 6']['link']['nid'], 6);
-    $this->assertEqual($tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 7 7']['link']['nid'], 7);
+    $this->assertIdentical($tree['49990 Node 4 4']['link']['nid'], '4');
+    $this->assertIdentical($tree['49990 Node 4 4']['below']['50000 Node 5 5']['link']['nid'], '5');
+    $this->assertIdentical($tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 6 6']['link']['nid'], '6');
+    $this->assertIdentical($tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 7 7']['link']['nid'], '7');
     $this->assertIdentical($tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 6 6']['below'], array());
     $this->assertIdentical($tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 7 7']['below'], array());
   }
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
@@ -81,8 +81,8 @@ protected function setUp() {
    */
   public function testCckFieldRevision() {
     $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2);
-    $this->assertEqual($node->id(), 1, 'Node 1 loaded.');
-    $this->assertEqual($node->getRevisionId(), 2, 'Node 1 revision 2loaded.');
+    $this->assertIdentical($node->id(), '1', 'Node 1 loaded.');
+    $this->assertIdentical($node->getRevisionId(), '2', 'Node 1 revision 2loaded.');
   }
 
 }