diff --git a/core/modules/node/src/Plugin/migrate/source/d7/NodeMaster.php b/core/modules/node/src/Plugin/migrate/source/d7/NodeMaster.php
index 8519f0b94f..7ca211416c 100644
--- a/core/modules/node/src/Plugin/migrate/source/d7/NodeMaster.php
+++ b/core/modules/node/src/Plugin/migrate/source/d7/NodeMaster.php
@@ -37,7 +37,6 @@ public function query() {
     $query->addField('etr', 'created', 'etr_created');
     $query->addField('etr', 'changed', 'etr_changed');
 
-    $query->orderBy('n.nid');
     $query->orderBy('nr.vid');
     $query->orderBy('etr_language');
     $query->orderBy('n.language');
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterETTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterETTest.php
index c2af344cf0..f434f2e519 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterETTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterETTest.php
@@ -138,6 +138,8 @@ protected function assertRevision(array $revision, array $data) {
   /**
    * Provides the expected node_field_data table.
    *
+   * In the source database node 1 is type page and node 2 is an article.
+   *
    * @return array
    *   The table.
    */
@@ -200,7 +202,7 @@ protected function expectedNodeFieldDataTable() {
       3 =>
         [
           'nid' => '2',
-          'vid' => '8',
+          'vid' => '9',
           'type' => 'article',
           'langcode' => 'en',
           'status' => '1',
@@ -218,7 +220,7 @@ protected function expectedNodeFieldDataTable() {
       4 =>
         [
           'nid' => '2',
-          'vid' => '8',
+          'vid' => '9',
           'type' => 'article',
           'langcode' => 'it',
           'status' => '1',
@@ -229,14 +231,14 @@ protected function expectedNodeFieldDataTable() {
           'promote' => '1',
           'sticky' => '0',
           'default_langcode' => '0',
-          'revision_translation_affected' => '1',
+          'revision_translation_affected' => NULL,
           'content_translation_source' => 'en',
           'content_translation_outdated' => '0',
         ],
       5 =>
         [
           'nid' => '2',
-          'vid' => '8',
+          'vid' => '9',
           'type' => 'article',
           'langcode' => 'mi',
           'status' => '1',
@@ -247,7 +249,7 @@ protected function expectedNodeFieldDataTable() {
           'promote' => '1',
           'sticky' => '0',
           'default_langcode' => '0',
-          'revision_translation_affected' => NULL,
+          'revision_translation_affected' => '1',
           'content_translation_source' => 'en',
           'content_translation_outdated' => '0',
         ],
@@ -288,8 +290,8 @@ protected function expectedNodeFieldRevisionTable() {
           'uid' => '1',
           'title' => 'Page tahi',
           'created' => '1568261523',
-          // @todo: why is this the current date.
-          'changed' => '1568794727',
+          // @todo: this becomes the current time.
+          'changed' => '1568261523',
           'promote' => '0',
           'sticky' => '0',
           'default_langcode' => '1',
@@ -340,7 +342,6 @@ protected function expectedNodeFieldRevisionTable() {
           'uid' => '1',
           'title' => 'Page one',
           'created' => '1568261548',
-          // @todo. Find out why this becomes the current time.
           'changed' => '1568261548',
           'promote' => '0',
           'sticky' => '0',
@@ -511,7 +512,7 @@ protected function expectedNodeFieldRevisionTable() {
           'uid' => '1',
           'title' => 'Colors',
           'created' => '1568702543',
-          'changed' => '1568703365',
+          'changed' => '1568702543',
           'promote' => '1',
           'sticky' => '0',
           'default_langcode' => '0',
@@ -540,16 +541,16 @@ protected function expectedNodeFieldRevisionTable() {
         [
           'nid' => '2',
           'vid' => '9',
-          'langcode' => 'mi',
+          'langcode' => 'it',
           'status' => '1',
           'uid' => '1',
           'title' => 'Colors',
-          'created' => '1568702543',
-          'changed' => '1568703365',
+          'created' => '1568703243',
+          'changed' => '1568703243',
           'promote' => '1',
           'sticky' => '0',
           'default_langcode' => '0',
-          'revision_translation_affected' => '1',
+          'revision_translation_affected' => NULL,
           'content_translation_source' => 'en',
           'content_translation_outdated' => '0',
         ],
@@ -684,7 +685,7 @@ protected function expectedRevisionEntityData() {
             'log' => '4th',
             'field_tree' => NULL,
             'created' => '1568703243',
-            'changed' => '1568703365',
+            'changed' => '1568702543',
           ],
         // Node 2, revision 9, en.
         15 =>
@@ -694,13 +695,13 @@ protected function expectedRevisionEntityData() {
             'created' => '1568703365',
             'changed' => '1568702345',
           ],
-        // Node 2, revision 9, mi.
+        // Node 2, revision 9, it.
         16 =>
           [
             'log' => '5th',
             'field_tree' => NULL,
             'created' => '1568703365',
-            'changed' => '1568703365',
+            'changed' => '1568703243',
           ],
       ],
     ];
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterTest.php
index 51c572d86d..107680f4e6 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeMasterTest.php
@@ -56,12 +56,19 @@ protected function setUp() {
 
     $this->migrateUsers();
     $this->migrateFields();
+    $this->migrateTaxonomyTerms();
     $this->executeMigrations([
       'language',
+      'd7_language_content_taxonomy_vocabulary_settings',
+      'd7_taxonomy_term_localized_translation',
+      'd7_taxonomy_term_translation',
       'd7_language_content_settings',
       'd7_comment_field',
       'd7_comment_field_instance',
       'd7_node_master',
+      'd7_entity_translation_settings',
+      'd7_taxonomy_term_entity_translation',
+      'd7_node_entity_translation',
     ]);
     $this->nodeStorage = $this->container->get('entity_type.manager')
       ->getStorage('node');