diff --git a/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
index d284b71d80..899a1c4372 100644
--- a/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
+++ b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
@@ -69,7 +69,7 @@ public static function create(ContainerInterface $container, $base_plugin_id) {
    * {@inheritdoc}
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
-    if ($base_plugin_definition['id'] == 'd6_node_translation' && !$this->includeTranslations) {
+    if (in_array('translation', $base_plugin_definition['migration_tags']) && !$this->includeTranslations) {
       // Refuse to generate anything.
       return $this->derivatives;
     }
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeRevisionTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeRevisionTest.php
index f4a48ae2ff..85b16ebd1d 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeRevisionTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeRevisionTest.php
@@ -78,9 +78,9 @@ protected function assertRevision($id, $langcode, $title, $log, $field_text_fiel
   public function testNodeTranslationRevisions() {
     // Test the first revision.
     $this->assertRevision(13, 'en', 'The Real McCoy (first revision)', 'First revision (en)', 'McCoy first revision (en)', '1');
-    $this->assertRevision(14, 'fr', 'Le Vrai McCoy (first revision)', 'First revision (fr)', 'McCoy first revision (fr)', '1');
+    $this->assertRevision(2007, 'fr', 'Le Vrai McCoy (first revision)', 'First revision (fr)', 'McCoy first revision (fr)', '1');
     $this->assertRevision(15, 'zu', 'Abantu zulu (first revision)', 'First revision (zu)', 'Zulu first revision (zu)', '1');
-    $this->assertRevision(16, 'en', 'The Zulu People (first revision)', 'First revision (en)', 'Zulu first revision (en)', '1');
+    $this->assertRevision(2008, 'en', 'The Zulu People (first revision)', 'First revision (en)', 'Zulu first revision (en)', '1');
 
     // Test the current revision.
     $this->assertRevision(24, 'en', 'The Real McCoy', 'Current revision (en)', 'McCoy current revision (en)', '1');
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php
index 6782328375..4e3777f4f8 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php
@@ -116,9 +116,9 @@ protected function assertRevision($id, $langcode, $title, $log, $field_text_plai
   public function testNodeTranslationRevisions() {
     // Test the first revision.
     $this->assertRevision(2, 'en', 'The thing about Deep Space 9 (first revision)', 'First revision (en)', 'DS9 first revision (en)', '1');
-    $this->assertRevision(3, 'is', 'is - The thing about Deep Space 9 (first revision)', 'First revision (is)', 'DS9 first revision (is)', '1');
+    $this->assertRevision(13, 'is', 'is - The thing about Deep Space 9 (first revision)', 'First revision (is)', 'DS9 first revision (is)', '1');
     $this->assertRevision(4, 'is', 'is - The thing about Firefly (first revision)', 'First revision (is)', 'Firefly first revision (is)', '1');
-    $this->assertRevision(5, 'en', 'en - The thing about Firefly (first revision)', 'First revision (en)', 'Firefly first revision (en)', '1');
+    $this->assertRevision(14, 'en', 'en - The thing about Firefly (first revision)', 'First revision (en)', 'Firefly first revision (en)', '1');
 
     // Test the current revision.
     $this->assertRevision(8, 'en', 'The thing about Deep Space 9', 'Current revision (en)', 'DS9 current revision (en)', '1');