diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
index 5793fd36f2ce898da09af76a0b632fc0be393abd..d9b1c2cd72af8c12b0acb7241aa605b8b3879548 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal6.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
@@ -44160,17 +44160,6 @@
   'timestamp' => '1420861423',
   'format' => '1',
 ))
-->values(array(
-  'nid' => '1',
-  'vid' => '2',
-  'uid' => '2',
-  'title' => 'Test title rev 2',
-  'body' => 'body test rev 2',
-  'teaser' => 'teaser test rev 2',
-  'log' => 'modified rev 2',
-  'timestamp' => '1390095702',
-  'format' => '1',
-))
 ->values(array(
   'nid' => '2',
   'vid' => '3',
@@ -44402,6 +44391,17 @@
   'timestamp' => '1520613305',
   'format' => '1',
 ))
+->values(array(
+  'nid' => '1',
+  'vid' => '2001',
+  'uid' => '2',
+  'title' => 'Test title rev 2',
+  'body' => 'body test rev 2',
+  'teaser' => 'teaser test rev 2',
+  'log' => 'modified rev 2',
+  'timestamp' => '1390095702',
+  'format' => '1',
+))
 ->execute();
 
 $connection->schema()->createTable('node_type', array(
@@ -46835,12 +46835,12 @@
 ))
 ->values(array(
   'nid' => '1',
-  'vid' => '2',
+  'vid' => '2001',
   'tid' => '4',
 ))
 ->values(array(
   'nid' => '1',
-  'vid' => '2',
+  'vid' => '2001',
   'tid' => '5',
 ))
 ->values(array(
diff --git a/core/modules/node/tests/src/Functional/Migrate/d6/MigrateNodeRevisionTest.php b/core/modules/node/tests/src/Functional/Migrate/d6/MigrateNodeRevisionTest.php
index 075e72767892ef2196c5d55c09c2171950fb0d74..4065278bcfbb033563d31ef0d552f7f02a3bcdbd 100644
--- a/core/modules/node/tests/src/Functional/Migrate/d6/MigrateNodeRevisionTest.php
+++ b/core/modules/node/tests/src/Functional/Migrate/d6/MigrateNodeRevisionTest.php
@@ -28,10 +28,10 @@ protected function setUp() {
    * Test node revisions migration from Drupal 6 to 8.
    */
   public function testNodeRevision() {
-    $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2);
+    $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2001);
     /** @var \Drupal\node\NodeInterface $node */
     $this->assertIdentical('1', $node->id());
-    $this->assertIdentical('2', $node->getRevisionId());
+    $this->assertIdentical('2001', $node->getRevisionId());
     $this->assertIdentical('und', $node->langcode->value);
     $this->assertIdentical('Test title rev 2', $node->getTitle());
     $this->assertIdentical('body test rev 2', $node->body->value);
diff --git a/core/modules/taxonomy/migrations/d6_term_node_revision.yml b/core/modules/taxonomy/migrations/d6_term_node_revision.yml
index 2edf86054dad690ed71975d3a3f4d4ed0989f6ed..9487984f94084790c4d57d33898abb3df1e92caa 100644
--- a/core/modules/taxonomy/migrations/d6_term_node_revision.yml
+++ b/core/modules/taxonomy/migrations/d6_term_node_revision.yml
@@ -11,7 +11,7 @@ process:
   vid:
     -
       plugin: migration_lookup
-      migration: d6_node
+      migration: d6_node_revision
       source: vid
     -
       plugin: skip_on_empty
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 614725d966ecc017136a368231571d667a4189b9..25544486ab2862e5f72f49f030b2928c6084ba33 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
@@ -31,7 +31,7 @@ protected function setUp() {
    * Tests the Drupal 6 term-node revision association to Drupal 8 migration.
    */
   public function testTermRevisionNode() {
-    $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2);
+    $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2001);
     $this->assertSame(2, count($node->field_vocabulary_3_i_2_));
     $this->assertSame('4', $node->field_vocabulary_3_i_2_[0]->target_id);
     $this->assertSame('5', $node->field_vocabulary_3_i_2_[1]->target_id);