reverted:
--- b/core/modules/node/src/Tests/d6/MigrateNodeBundleSettingsTest.php
+++ a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeBundleSettingsTest.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeBundleSettingsTest.
- * Contains \Drupal\node\Tests\d6\MigrateNodeBundleSettingsTest.
  */
 
+namespace Drupal\migrate_drupal\Tests\d6;
-namespace Drupal\node\Tests\d6;
 
 /**
  * Test migrating node settings into the base_field_bundle_override config entity.
  *
+ * @group migrate_drupal
- * @group node
  */
 class MigrateNodeBundleSettingsTest extends MigrateDrupal6TestBase {
 
reverted:
--- b/core/modules/node/src/Tests/d6/MigrateNodeConfigsTest.php
+++ a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php
@@ -2,17 +2,17 @@
 
 /**
  * @file
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeConfigsTest.
- * Contains \Drupal\node\Tests\d6\MigrateNodeConfigsTest.
  */
 
+namespace Drupal\migrate_drupal\Tests\d6;
-namespace Drupal\node\Tests\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
 
 /**
  * Upgrade variables to node.settings.yml.
  *
+ * @group migrate_drupal
- * @group node
  */
 class MigrateNodeConfigsTest extends MigrateDrupal6TestBase {
 
reverted:
--- b/core/modules/node/src/Tests/d6/MigrateNodeRevisionTest.php
+++ a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php
@@ -2,17 +2,17 @@
 
 /**
  * @file
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeRevisionTest.
- * Contains \Drupal\node\Tests\d6\MigrateNodeRevisionTest.
  */
 
+namespace Drupal\migrate_drupal\Tests\d6;
-namespace Drupal\node\Tests\d6;
 
 use Drupal\Core\Database\Database;
 
 /**
  * Node content revisions migration.
  *
+ * @group migrate_drupal
- * @group node
  */
 class MigrateNodeRevisionTest extends MigrateNodeTestBase {
 
reverted:
--- b/core/modules/node/src/Tests/d6/MigrateNodeTest.php
+++ a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTest.
- * Contains \Drupal\node\Tests\d6\MigrateNodeTest.
  */
 
+namespace Drupal\migrate_drupal\Tests\d6;
-namespace Drupal\node\Tests\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\Core\Database\Database;
@@ -14,7 +14,7 @@
 /**
  * Node content migration.
  *
+ * @group migrate_drupal
- * @group node
  */
 class MigrateNodeTest extends MigrateNodeTestBase {
 
reverted:
--- b/core/modules/node/src/Tests/d6/MigrateNodeTestBase.php
+++ a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTestBase.
- * Contains \Drupal\node\Tests\d6\MigrateNodeTestBase.
  */
 
+namespace Drupal\migrate_drupal\Tests\d6;
-namespace Drupal\node\Tests\d6;
 
 use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\user\Entity\User;
reverted:
--- b/core/modules/node/src/Tests/d6/MigrateNodeTypeTest.php
+++ a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTypeTest.
- * Contains \Drupal\node\Tests\d6\MigrateNodeTypeTest.
  */
 
+namespace Drupal\migrate_drupal\Tests\d6;
-namespace Drupal\node\Tests\d6;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\node\Entity\NodeType;
@@ -13,7 +13,7 @@
 /**
  * Upgrade node types to node.type.*.yml.
  *
+ * @group migrate_drupal
- * @group node
  */
 class MigrateNodeTypeTest extends MigrateDrupal6TestBase {
 
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
+++ b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
@@ -157,21 +157,6 @@ migrate.source.d6_contact_settings:
         type: string
         label: 'Variable'
 
-migrate.source.d6_view_mode:
-  type: migrate_source_sql
-  label: 'Drupal 6 view mode'
-  mapping:
-    constants:
-      type: mapping
-      label: 'Constants'
-      mapping:
-        targetEntityType:
-          type: string
-          label: 'Target entity type'
-        status:
-          type: boolean
-          label: 'Status'
-
 migrate.source.d6_profile_field:
   type: migrate_source_sql
   label: 'Drupal 6 profile field'
only in patch2:
unchanged:
--- a/core/modules/node/config/schema/node.schema.yml
+++ b/core/modules/node/config/schema/node.schema.yml
@@ -112,3 +112,18 @@ condition.plugin.node_type:
       type: sequence
       sequence:
         type: string
+
+migrate.source.d6_view_mode:
+  type: migrate_source_sql
+  label: 'Drupal 6 view mode'
+  mapping:
+    constants:
+      type: mapping
+      label: 'Constants'
+      mapping:
+        targetEntityType:
+          type: string
+          label: 'Target entity type'
+        status:
+          type: boolean
+          label: 'Status'
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/NodeUpdate7008.php
+++ b/core/modules/node/src/Plugin/migrate/process/d6/NodeUpdate7008.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\NodeUpdate7008.
+ * Contains \Drupal\node\Plugin\migrate\process\d6\NodeUpdate7008.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\node\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewMode.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php
@@ -2,15 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ViewMode.
+ * Contains \Drupal\node\Plugin\migrate\source\d6\ViewMode.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
-
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+namespace Drupal\node\Plugin\migrate\source\d6;
 
 /**
  * The view mode source.
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewModeBase.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/ViewModeBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ViewModeBase.
+ * Contains \Drupal\node\Plugin\migrate\source\d6\ViewModeBase.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\node\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeBundleSettingsTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeBundleSettingsTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeBundleSettingsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Test migrating node settings into the base_field_bundle_override config entity.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateNodeBundleSettingsTest extends MigrateDrupal6TestBase {
 
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeConfigsTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to node.settings.yml.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateNodeConfigsTest extends MigrateDrupal6TestBase {
 
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeRevisionTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeRevisionTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
 use Drupal\Core\Database\Database;
 
 /**
  * Node content revisions migration.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateNodeRevisionTest extends MigrateNodeTestBase {
 
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\Core\Database\Database;
@@ -14,7 +14,7 @@
 /**
  * Node content migration.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateNodeTest extends MigrateNodeTestBase {
 
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php
@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTestBase.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTestBase.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
 use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\user\Entity\User;
 
 /**
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php
@@ -2,18 +2,19 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTypeTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTypeTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
 use Drupal\field\Entity\FieldConfig;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\NodeType;
 
 /**
  * Upgrade node types to node.type.*.yml.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateNodeTypeTest extends MigrateDrupal6TestBase {
 
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateViewModesTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateViewModesTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateViewModesTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityViewMode;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate view modes.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateViewModesTest extends MigrateDrupal6TestBase {