diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6DumpBase.php b/core/modules/migrate_drupal/src/Tests/Dump/DrupalDumpBase.php
similarity index 93%
rename from core/modules/migrate_drupal/src/Tests/Dump/Drupal6DumpBase.php
rename to core/modules/migrate_drupal/src/Tests/Dump/DrupalDumpBase.php
index 6b97f39..6b62d77 100644
--- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6DumpBase.php
+++ b/core/modules/migrate_drupal/src/Tests/Dump/DrupalDumpBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase.
+ * Contains \Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase.
  */
 
 namespace Drupal\migrate_drupal\Tests\Dump;
@@ -12,7 +12,7 @@
 /**
  * Base class for the dump classes.
  */
-class Drupal6DumpBase {
+class DrupalDumpBase {
 
   /**
    * The database connection.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Access.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Access.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/Access.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Access.php
index 5f2ef93..0553b4f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Access.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Access.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the access table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Actions.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Actions.php
similarity index 98%
rename from core/modules/migrate_drupal/src/Tests/Table/Actions.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Actions.php
index 3573edf..642bc9a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Actions.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Actions.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the actions table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ActionsAid.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ActionsAid.php
similarity index 93%
rename from core/modules/migrate_drupal/src/Tests/Table/ActionsAid.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ActionsAid.php
index 750f1a3..6176ac0 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ActionsAid.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ActionsAid.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the actions_aid table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/AggregatorCategory.php b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorCategory.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/AggregatorCategory.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorCategory.php
index 924885e..a4df190 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/AggregatorCategory.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorCategory.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the aggregator_category table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/AggregatorFeed.php b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorFeed.php
similarity index 98%
rename from core/modules/migrate_drupal/src/Tests/Table/AggregatorFeed.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorFeed.php
index 20d06e5..ee87b7b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/AggregatorFeed.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorFeed.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the aggregator_feed table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/AggregatorItem.php b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorItem.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/AggregatorItem.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorItem.php
index ec8e640..5af229d 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/AggregatorItem.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorItem.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the aggregator_item table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Authmap.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Authmap.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/Authmap.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Authmap.php
index d9b591b..bd934fe 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Authmap.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Authmap.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the authmap table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Batch.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Batch.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/Batch.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Batch.php
index 8e85e2d..cb32cfe 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Batch.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Batch.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the batch table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Blocks.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Blocks.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/Blocks.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Blocks.php
index 634644b..509bac1 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Blocks.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Blocks.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the blocks table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/BlocksRoles.php b/core/modules/migrate_drupal/src/Tests/Table/d6/BlocksRoles.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/BlocksRoles.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/BlocksRoles.php
index e69bcb7..fe3634d 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/BlocksRoles.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/BlocksRoles.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the blocks_roles table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Book.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Book.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/Book.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Book.php
index 696efc2..8b206c8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Book.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Book.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the book table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Boxes.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Boxes.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/Boxes.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Boxes.php
index a3fd609..7ae6346 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Boxes.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Boxes.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the boxes table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Comments.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Comments.php
similarity index 98%
rename from core/modules/migrate_drupal/src/Tests/Table/Comments.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Comments.php
index 566ffa6..f209370 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Comments.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Comments.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the comments table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Config.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Config.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/Config.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Config.php
index 5c3c2ff..0d98598 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Config.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Config.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the config table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Contact.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Contact.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/Contact.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Contact.php
index b2928a4..efab2db 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Contact.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Contact.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the contact table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldImage.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldImage.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentFieldImage.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldImage.php
index b0e756d..0505e8e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldImage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldImage.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_field_image table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldMultivalue.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldMultivalue.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentFieldMultivalue.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldMultivalue.php
index 911398d..a16b128 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldMultivalue.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldMultivalue.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_field_multivalue table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTest.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTest.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentFieldTest.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTest.php
index c6d34f2..6c42bbd 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTest.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_field_test table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestTwo.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTestTwo.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestTwo.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTestTwo.php
index 2889e10..f24df87 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestTwo.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTestTwo.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_field_test_two table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentGroup.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroup.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentGroup.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroup.php
index f84ffdc..02ad4e0 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentGroup.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroup.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_group table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentGroupFields.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroupFields.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentGroupFields.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroupFields.php
index d4873cb..4ad0b08 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentGroupFields.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroupFields.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_group_fields table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeField.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeField.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentNodeField.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeField.php
index cc5608e..461a4e1 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeField.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeField.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_node_field table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeFieldInstance.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeFieldInstance.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentNodeFieldInstance.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeFieldInstance.php
index b41a9ef..2e6316d 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeFieldInstance.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeFieldInstance.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_node_field_instance table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentTypePage.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypePage.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentTypePage.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypePage.php
index 0f360be..15a7b5e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentTypePage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypePage.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_type_page table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeStory.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeStory.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentTypeStory.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeStory.php
index 98faa2a..43a4647 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeStory.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeStory.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_type_story table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPage.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPage.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPage.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPage.php
index 0242458..2fe2c4d 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPage.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_type_test_page table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPlanet.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPlanet.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPlanet.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPlanet.php
index 55a559f..f401533 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPlanet.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPlanet.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the content_type_test_planet table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/DateFormatLocale.php b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatLocale.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/DateFormatLocale.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatLocale.php
index a964c6a..efe9c71 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/DateFormatLocale.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatLocale.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the date_format_locale table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/DateFormatTypes.php b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatTypes.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/DateFormatTypes.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatTypes.php
index 3e6c46b..4666d7b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/DateFormatTypes.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatTypes.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the date_format_types table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/DateFormats.php b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormats.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/DateFormats.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/DateFormats.php
index 81e8def..83bea4a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/DateFormats.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormats.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the date_formats table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Event.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Event.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/Event.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Event.php
index d33928f..42656c0 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Event.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Event.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the event table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/EventTimezones.php b/core/modules/migrate_drupal/src/Tests/Table/d6/EventTimezones.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/EventTimezones.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/EventTimezones.php
index 1878bbf..614efc5 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/EventTimezones.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/EventTimezones.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the event_timezones table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Files.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Files.php
similarity index 98%
rename from core/modules/migrate_drupal/src/Tests/Table/Files.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Files.php
index f809a25..a32cb7c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Files.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Files.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the files table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/FilterFormats.php b/core/modules/migrate_drupal/src/Tests/Table/d6/FilterFormats.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/FilterFormats.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/FilterFormats.php
index 8f8b11a..f0acd45 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/FilterFormats.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/FilterFormats.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the filter_formats table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Filters.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Filters.php
similarity index 98%
rename from core/modules/migrate_drupal/src/Tests/Table/Filters.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Filters.php
index a09a871..8a52ed5 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Filters.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Filters.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the filters table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Flood.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Flood.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/Flood.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Flood.php
index 6ff2903..3001511 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Flood.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Flood.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the flood table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/History.php b/core/modules/migrate_drupal/src/Tests/Table/d6/History.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/History.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/History.php
index f054018..e7fcec8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/History.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/History.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the history table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/MenuCustom.php b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuCustom.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/MenuCustom.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/MenuCustom.php
index 932ac4d..d30410f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/MenuCustom.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuCustom.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the menu_custom table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/MenuLinks.php b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/MenuLinks.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php
index 2fb6ee0..c5b01c1 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/MenuLinks.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the menu_links table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Node.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Node.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/Node.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Node.php
index 4da6aee..fd16444 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Node.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Node.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the node table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeAccess.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeAccess.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/NodeAccess.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/NodeAccess.php
index 753348e..690f6f1 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/NodeAccess.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeAccess.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the node_access table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeCommentStatistics.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCommentStatistics.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/NodeCommentStatistics.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/NodeCommentStatistics.php
index 2f6aa57..10de6df 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/NodeCommentStatistics.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCommentStatistics.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the node_comment_statistics table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeCounter.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCounter.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/NodeCounter.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/NodeCounter.php
index 9ad22c2..ff6df81 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/NodeCounter.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCounter.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the node_counter table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeRevisions.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeRevisions.php
similarity index 98%
rename from core/modules/migrate_drupal/src/Tests/Table/NodeRevisions.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/NodeRevisions.php
index ef5345f..179a30b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/NodeRevisions.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeRevisions.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the node_revisions table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeType.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeType.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/NodeType.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/NodeType.php
index e049273..4c948fd 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/NodeType.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeType.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the node_type table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Permission.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Permission.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/Permission.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Permission.php
index b771262..697983c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Permission.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Permission.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the permission table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ProfileFields.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileFields.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/ProfileFields.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ProfileFields.php
index 56152ef..8cea7a8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ProfileFields.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileFields.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the profile_fields table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ProfileValues.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileValues.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/ProfileValues.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/ProfileValues.php
index 859d57e..27e0376 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ProfileValues.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileValues.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the profile_values table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Role.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Role.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/Role.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Role.php
index b3c1877..bb17ad2 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Role.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Role.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the role table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Semaphore.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Semaphore.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/Semaphore.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Semaphore.php
index 4c80ef9..992633a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Semaphore.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Semaphore.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the semaphore table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/System.php b/core/modules/migrate_drupal/src/Tests/Table/d6/System.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/System.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/System.php
index 08e638d..4467986 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/System.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/System.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the system table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermData.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermData.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/TermData.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/TermData.php
index 106e581..306123e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/TermData.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermData.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the term_data table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermHierarchy.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermHierarchy.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/TermHierarchy.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/TermHierarchy.php
index 0ca4f63..41ee8b5 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/TermHierarchy.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermHierarchy.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the term_hierarchy table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermNode.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermNode.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/TermNode.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/TermNode.php
index d8d1675..012d721 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/TermNode.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermNode.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the term_node table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermRelation.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermRelation.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/TermRelation.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/TermRelation.php
index 8f7c5e0..5ee17a1 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/TermRelation.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermRelation.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the term_relation table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermSynonym.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermSynonym.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/Table/TermSynonym.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/TermSynonym.php
index cfa58bf..60355c5 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/TermSynonym.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermSynonym.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the term_synonym table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Upload.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Upload.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/Table/Upload.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Upload.php
index f7ec4fa..017462b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Upload.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Upload.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the upload table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/UrlAlias.php b/core/modules/migrate_drupal/src/Tests/Table/d6/UrlAlias.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/UrlAlias.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/UrlAlias.php
index 80b8acf..43d0e50 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/UrlAlias.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/UrlAlias.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the url_alias table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Users.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/Users.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Users.php
index 87c0028..7509400 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Users.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the users table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/UsersRoles.php b/core/modules/migrate_drupal/src/Tests/Table/d6/UsersRoles.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/UsersRoles.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/UsersRoles.php
index 494749e..b17dfa8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/UsersRoles.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/UsersRoles.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the users_roles table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Variable.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Variable.php
similarity index 99%
rename from core/modules/migrate_drupal/src/Tests/Table/Variable.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Variable.php
index b848e70..a058672 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Variable.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Variable.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the variable table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Vocabulary.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Vocabulary.php
similarity index 98%
rename from core/modules/migrate_drupal/src/Tests/Table/Vocabulary.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/Vocabulary.php
index 3936d1c..593812b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Vocabulary.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Vocabulary.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the vocabulary table.
diff --git a/core/modules/migrate_drupal/src/Tests/Table/VocabularyNodeTypes.php b/core/modules/migrate_drupal/src/Tests/Table/d6/VocabularyNodeTypes.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/Table/VocabularyNodeTypes.php
rename to core/modules/migrate_drupal/src/Tests/Table/d6/VocabularyNodeTypes.php
index a52778d..695ed12 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/VocabularyNodeTypes.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/VocabularyNodeTypes.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the vocabulary_node_types table.
diff --git a/core/modules/migrate_drupal/src/Tests/d6.gz b/core/modules/migrate_drupal/src/Tests/d6.gz
index b245ec9..73b2075 100644
--- a/core/modules/migrate_drupal/src/Tests/d6.gz
+++ b/core/modules/migrate_drupal/src/Tests/d6.gz
@@ -1,4 +1,4 @@
-��Y�T��s�ȑ0���_
;��D�#��y���f��h�cv�Y�7
���n��@@��'�����:���w���X$�BUVޕ��ur⼿��_��b6wڭ�v�q^i�C������{�ݱs'N�~�f-��������������٥�#/��_����z����d���/?�ɍ�8�iG�O��������j��Χ7���||�����W?����]������7>��/�=v�����~~��w�?��������ݫ�o?~`�}���{���<.�����7��Ev}����?�}���ߏް.��Ŷ�ٳ��պl���6�vO��ˇ����6�7��
fj�}옯[%�����7o����ۛ����K�V	���?��y�_���ه��_>t���;�������6�v;�ׇ���|����=& 8W����0qX��E�d���h��?���^���'���޽q�������K���ލ?vG�;
+����T��s�ȑ0���_
;��D�#��y���f��h�cv�Y�7
���n��@@��'�����:���w���X$�BUVޕ��ur⼿��_��b6wڭ�v�q^i�C������{�ݱs'N�~�f-��������������٥�#/��_����z����d���/?�ɍ�8�iG�O��������j��Χ7���||�����W?����]������7>��/�=v�����~~��w�?��������ݫ�o?~`�}���{���<.�����7��Ev}����?�}���ߏް.��Ŷ�ٳ��պl���6�vO��ˇ����6�7��
fj�}옯[%�����7o����ۛ����K�V	���?��y�_���ه��_>t���;�������6�v;�ׇ���|����=& 8W����0qX��E�d���h��?���^���'���޽q�������K���ލ?vG�;
 ?BIq����/���x��O�����B��������߼���#@p�~�?��?� ʎ�������w�D����L����K��ӹ����k�_����x��3l�����M����,�����i�������~���x�9B�������_�2.~E����' �14�U��_3=Dg�tW��}��o�`Ed��?���FD��z�TD���~�l^��(m��������x4c���I��~��`�ش��Z6��vʙ���p荚����?���0�&��5�����OGI0�B{�L��G��9Ejؚ�*��������y���G�*�O�ѳQ<�1��b�ԥώ��[�	��'z��ϏU���A��F�_�S��(�����i��ܩO�
�ao��{Ϟ;sp��e��ET�i��ѭx�:�'�,�|{����NzF�e�s�Č����:���贂FЩ���އ�����=�}��V57�k����,�=��f��Y"�s%�H0)��!󂿸�\5�����-��;/r���x�q�4�_;�E��㧹��׊����=<�uY+ԛ�>.��z���
 !y���-�D���s:X�h`S�4�&��Z6vc�o���$�'^'����I��Ur���^��q٨�[�Y���6����bw�}�iA�OlG����}���o�I�ؾh*�o7)׾_�hsMD����|��=�d~K0�;�o�ݥ�K�k�0�:s޾>}��Ĩ.?�`~�)��;Z$�2����;p�r�$�5��S�5yS���2H2?��FS�Yp�{���,�̟�Ǭ3'�Gq4N�0�Է!�:�;��`�qw��A�Gbo��bc������a5XWiHfha,��[���u����O�W���7�^��w��t���f��n�ƫ�ٳ�Ѿ��������į��U�`#'��!X7��r���7Y�oX/��
 ��ϟb}�sf|}g�{c?9��(z�
ӗ0��c����qp4盿O}5wd�8It�������QC}X̆~L���0�y����2bϧ�um3Z(�G�cy�fj�?
�N��O�>1UL��	��&�;��҈��vb��(3����Dj]
@@ -744,4 +744,4 @@ Qu^v[5x)
 �����+��|ACb9�I��B���#�m���w:c)�
 P�&�
TG�@�x�ջ�7��qi����:���)��|@���8/逊�B�vWsc�E��V̗j��
>e��Վ.�B�X�#Vh�%1+4H-�������~h2�ZMژ	!�d�?�<D9*�Z���hF��5�ܥ�Bۂ"V1Z���[�0�{;Wh~���}F9I���֠�5_2����񂩉�#���ą-����Z'V/�Qӄ�]5Z���ռ6������-��˕�Z����&ϑ�zk:��r�!rȐSA!��į�a�I�h�+���EYkF�ⶕ�"����&t|>��]������8U��QN���&�TF�
 �Ǟa�TZ#k+�[�f3�6wN2���i��K�/����wU��-��)^Qd33�;w�h_MNx-9���b>����*����\�.�`��Na�#zE�0Nj�KDH�����������t}�diHY%u�FD�UL��
-�h0��~����c��sF��O�lyK�"�寧���#)��m�{u~q|���f��/����J�?_/Ka�S�R��U�y����fw����o�`֛��ǗLH.��W�OO�N����gg�/�#�x��7]��_*�⭐32H��[1Q��4;�Ms�lF�y�zn������y:�!
\ No newline at end of file
+�h0��~����c��sF��O�lyK�"�寧���#)��m�{u~q|���f��/����J�?_/Ka�S�R��U�y����fw����o�`֛��ǗLH.��W�OO�N����gg�/�#�x��7]��_*�⭐32H��[1Q��4;�Ms��F���w�Fb�:�!
\ No newline at end of file
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
new file mode 100644
index 0000000..90f0dc3
--- /dev/null
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
@@ -0,0 +1,23 @@
+<?php
+
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Tests\MigrateDrupal6TestBase.
+ */
+
+namespace Drupal\migrate_drupal\Tests;
+
+/**
+ * Base class for Drupal 6 migration tests.
+ */
+class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDumpDirectory() {
+    return __DIR__ . '/Table/d6';
+  }
+
+}
diff --git a/core/scripts/migrate-dump-d6.sh b/core/scripts/migrate-dump-d6.sh
index b5c0f30..1ea7ff5 100755
--- a/core/scripts/migrate-dump-d6.sh
+++ b/core/scripts/migrate-dump-d6.sh
@@ -11,7 +11,7 @@
  * need new Drupal 6 data.
  *
  *  - Clone the repository from: https://www.drupal.org/sandbox/benjy/2405029
- *  - Create a database called d6_migrate and import core/migrate_drupal/src/Tests/d6.gz
+ *  - Create a database called d6_migrate and import core/migrate_drupal/src/Tests/d6/d6.gz
  *  - Add an entry into your Drupal 8 settings file, eg: $databases['d6_migrate']['default'] = array ( // Credentials );
  *  - Use the Drupal 6 site to make data changes as needed.
  *  - Run ./core/scripts/migrate-dump-d6.sh to re-export the tables.
@@ -34,7 +34,7 @@
 $request = Request::createFromGlobals();
 Settings::initialize(dirname(dirname(__DIR__)), DrupalKernel::findSitePath($request), $autoloader);
 
-$output_folder = DRUPAL_ROOT . '/core/modules/migrate_drupal/src/Tests/Table';
+$output_folder = DRUPAL_ROOT . '/core/modules/migrate_drupal/src/Tests/Table/d6';
 $class_template = '<?php
 
 /**
@@ -49,7 +49,7 @@
 
 namespace Drupal\migrate_drupal\Tests\Table;
 
-use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
+use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
 
 /**
  * Generated file to represent the {{TABLE}} table.