diff --git a/modules/ingredient/migrations/recipe713_ingredient.yml b/modules/ingredient/migrations/recipe1x_ingredient.yml
similarity index 70%
rename from modules/ingredient/migrations/recipe713_ingredient.yml
rename to modules/ingredient/migrations/recipe1x_ingredient.yml
index dd89f32..5faa17b 100644
--- a/modules/ingredient/migrations/recipe713_ingredient.yml
+++ b/modules/ingredient/migrations/recipe1x_ingredient.yml
@@ -1,9 +1,10 @@
-id: recipe713_ingredient
+id: recipe1x_ingredient
 label: Ingredients
 migration_tags:
+  - Drupal 6
   - Drupal 7
 source:
-  plugin: recipe713_ingredient
+  plugin: recipe1x_ingredient
 process:
   id: id
   name: name
diff --git a/modules/ingredient/migrations/recipe713_ingredient_settings.yml b/modules/ingredient/migrations/recipe1x_ingredient_settings.yml
similarity index 86%
rename from modules/ingredient/migrations/recipe713_ingredient_settings.yml
rename to modules/ingredient/migrations/recipe1x_ingredient_settings.yml
index ca11aef..be30a0f 100644
--- a/modules/ingredient/migrations/recipe713_ingredient_settings.yml
+++ b/modules/ingredient/migrations/recipe1x_ingredient_settings.yml
@@ -1,6 +1,7 @@
-id: recipe713_ingredient_settings
+id: recipe1x_ingredient_settings
 label: Ingredient configuration
 migration_tags:
+  - Drupal 6
   - Drupal 7
 source:
   plugin: variable
diff --git a/modules/ingredient/src/Plugin/migrate/source/recipe713/Ingredient.php b/modules/ingredient/src/Plugin/migrate/source/recipe1x/Ingredient.php
similarity index 80%
rename from modules/ingredient/src/Plugin/migrate/source/recipe713/Ingredient.php
rename to modules/ingredient/src/Plugin/migrate/source/recipe1x/Ingredient.php
index 4d5b890..b38e089 100644
--- a/modules/ingredient/src/Plugin/migrate/source/recipe713/Ingredient.php
+++ b/modules/ingredient/src/Plugin/migrate/source/recipe1x/Ingredient.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Drupal\ingredient\Plugin\migrate\source\recipe713;
+namespace Drupal\ingredient\Plugin\migrate\source\recipe1x;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
- * Drupal 7 ingredient source from database.
+ * Recipe 6.x-1.x and 7.x-1.x ingredient source from database.
  *
  * @MigrateSource(
- *   id = "recipe713_ingredient",
+ *   id = "recipe1x_ingredient",
  *   source_module = "recipe"
  * )
  */
diff --git a/modules/ingredient/tests/fixtures/ingredient61.php b/modules/ingredient/tests/fixtures/ingredient61.php
new file mode 100644
index 0000000..edfaf1a
--- /dev/null
+++ b/modules/ingredient/tests/fixtures/ingredient61.php
@@ -0,0 +1,605 @@
+<?php
+// @codingStandardsIgnoreFile
+/**
+ * @file
+ * A database agnostic dump for testing purposes.
+ *
+ * This file was generated by the Drupal 8.0 db-tools.php script.
+ */
+
+use Drupal\Core\Database\Database;
+
+$connection = Database::getConnection();
+
+$connection->schema()->createTable('recipe_ingredient', array(
+  'fields' => array(
+    'id' => array(
+      'type' => 'serial',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'name' => array(
+      'type' => 'varchar',
+      'not null' => FALSE,
+      'length' => '255',
+    ),
+    'link' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+  ),
+  'primary key' => array(
+    'id',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('recipe_ingredient')
+->fields(array(
+  'id',
+  'name',
+  'link',
+))
+->values(array(
+  'id' => '1',
+  'name' => 'water',
+  'link' => '0',
+))
+->values(array(
+  'id' => '2',
+  'name' => 'salt',
+  'link' => '0',
+))
+->execute();
+
+$connection->schema()->createTable('recipe_node_ingredient', array(
+  'fields' => array(
+    'id' => array(
+      'type' => 'serial',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'nid' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'unit_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'quantity' => array(
+      'type' => 'float',
+      'not null' => FALSE,
+      'size' => 'normal',
+    ),
+    'ingredient_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'weight' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'note' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => '',
+    ),
+  ),
+  'primary key' => array(
+    'id',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('recipe_node_ingredient')
+->fields(array(
+  'id',
+  'nid',
+  'unit_id',
+  'quantity',
+  'ingredient_id',
+  'weight',
+  'note',
+))
+->values(array(
+  'id' => '1',
+  'nid' => '1',
+  'unit_id' => '11',
+  'quantity' => '2',
+  'ingredient_id' => '1',
+  'weight' => '0',
+  'note' => 'cold',
+))
+->values(array(
+  'id' => '2',
+  'nid' => '1',
+  'unit_id' => '12',
+  'quantity' => '1',
+  'ingredient_id' => '2',
+  'weight' => '0',
+  'note' => '',
+))
+->values(array(
+  'id' => '3',
+  'nid' => '2',
+  'unit_id' => '11',
+  'quantity' => '2',
+  'ingredient_id' => '1',
+  'weight' => '0',
+  'note' => 'cold',
+))
+->values(array(
+  'id' => '4',
+  'nid' => '3',
+  'unit_id' => '11',
+  'quantity' => '2',
+  'ingredient_id' => '1',
+  'weight' => '0',
+  'note' => 'cold',
+))
+->execute();
+
+$connection->schema()->createTable('recipe_unit', array(
+  'fields' => array(
+    'id' => array(
+      'type' => 'serial',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'name' => array(
+      'type' => 'varchar',
+      'not null' => FALSE,
+      'length' => '255',
+    ),
+    'abbreviation' => array(
+      'type' => 'varchar',
+      'not null' => FALSE,
+      'length' => '8',
+    ),
+    'metric' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'type' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '6',
+      'default' => 'Mass',
+    ),
+    'aliases' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+  ),
+  'primary key' => array(
+    'id',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('recipe_unit')
+->fields(array(
+  'id',
+  'name',
+  'abbreviation',
+  'metric',
+  'type',
+  'aliases',
+))
+->values(array(
+  'id' => '1',
+  'name' => 'Slice',
+  'abbreviation' => 'sli',
+  'metric' => '0',
+  'type' => 'Unit',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '2',
+  'name' => 'Unit',
+  'abbreviation' => '',
+  'metric' => '0',
+  'type' => 'Unit',
+  'aliases' => 'each,ea,whole',
+))
+->values(array(
+  'id' => '3',
+  'name' => 'Clove',
+  'abbreviation' => 'clv',
+  'metric' => '0',
+  'type' => 'Unit',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '4',
+  'name' => 'Pinch',
+  'abbreviation' => 'pn',
+  'metric' => '0',
+  'type' => 'Unit',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '5',
+  'name' => 'Package',
+  'abbreviation' => 'pk',
+  'metric' => '0',
+  'type' => 'Unit',
+  'aliases' => 'pack',
+))
+->values(array(
+  'id' => '6',
+  'name' => 'Can',
+  'abbreviation' => 'cn',
+  'metric' => '0',
+  'type' => 'Unit',
+  'aliases' => 'jar',
+))
+->values(array(
+  'id' => '7',
+  'name' => 'Drop',
+  'abbreviation' => 'dr',
+  'metric' => '0',
+  'type' => 'Unit',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '8',
+  'name' => 'Bunch',
+  'abbreviation' => 'bn',
+  'metric' => '0',
+  'type' => 'Unit',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '9',
+  'name' => 'Dash',
+  'abbreviation' => 'ds',
+  'metric' => '0',
+  'type' => 'Unit',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '10',
+  'name' => 'Carton',
+  'abbreviation' => 'ct',
+  'metric' => '0',
+  'type' => 'Unit',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '11',
+  'name' => 'Cup',
+  'abbreviation' => 'c',
+  'metric' => '0',
+  'type' => 'Volume',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '12',
+  'name' => 'Tablespoon',
+  'abbreviation' => 'T',
+  'metric' => '0',
+  'type' => 'Volume',
+  'aliases' => 'tbsp,tb',
+))
+->values(array(
+  'id' => '13',
+  'name' => 'Teaspoon',
+  'abbreviation' => 't',
+  'metric' => '0',
+  'type' => 'Volume',
+  'aliases' => 'tsp',
+))
+->values(array(
+  'id' => '14',
+  'name' => 'Pound',
+  'abbreviation' => 'lb',
+  'metric' => '0',
+  'type' => 'Mass',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '15',
+  'name' => 'Ounce',
+  'abbreviation' => 'oz',
+  'metric' => '0',
+  'type' => 'Mass',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '16',
+  'name' => 'Pint',
+  'abbreviation' => 'pt',
+  'metric' => '0',
+  'type' => 'Volume',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '17',
+  'name' => 'Quart',
+  'abbreviation' => 'q',
+  'metric' => '0',
+  'type' => 'Volume',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '18',
+  'name' => 'Gallon',
+  'abbreviation' => 'gal',
+  'metric' => '0',
+  'type' => 'Volume',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '19',
+  'name' => 'Milligram',
+  'abbreviation' => 'mg',
+  'metric' => '1',
+  'type' => 'Mass',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '20',
+  'name' => 'Centigram',
+  'abbreviation' => 'cg',
+  'metric' => '1',
+  'type' => 'Mass',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '21',
+  'name' => 'Gram',
+  'abbreviation' => 'g',
+  'metric' => '1',
+  'type' => 'Mass',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '22',
+  'name' => 'Kilogram',
+  'abbreviation' => 'kg',
+  'metric' => '1',
+  'type' => 'Mass',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '23',
+  'name' => 'Millilitre',
+  'abbreviation' => 'ml',
+  'metric' => '1',
+  'type' => 'Volume',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '24',
+  'name' => 'Centilitre',
+  'abbreviation' => 'cl',
+  'metric' => '1',
+  'type' => 'Volume',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '25',
+  'name' => 'Litre',
+  'abbreviation' => 'l',
+  'metric' => '1',
+  'type' => 'Volume',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '26',
+  'name' => 'Decilitre',
+  'abbreviation' => 'dl',
+  'metric' => '1',
+  'type' => 'Volume',
+  'aliases' => '',
+))
+->values(array(
+  'id' => '27',
+  'name' => 'Tablespoon (Metric)',
+  'abbreviation' => 'tbsp',
+  'metric' => '1',
+  'type' => 'Volume',
+  'aliases' => 'T',
+))
+->values(array(
+  'id' => '28',
+  'name' => 'Teaspoon (Metric)',
+  'abbreviation' => 'tsp',
+  'metric' => '1',
+  'type' => 'Volume',
+  'aliases' => 't',
+))
+->values(array(
+  'id' => '29',
+  'name' => 'Unknown',
+  'abbreviation' => 'Unknown',
+  'metric' => '0',
+  'type' => 'Unit',
+  'aliases' => '',
+))
+->execute();
+
+
+$connection->schema()->createTable('system', array(
+  'fields' => array(
+    'filename' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => '',
+    ),
+    'name' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => '',
+    ),
+    'type' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => '',
+    ),
+    'owner' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => '',
+    ),
+    'status' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'throttle' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'tiny',
+      'default' => '0',
+    ),
+    'bootstrap' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'schema_version' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'small',
+      'default' => '-1',
+    ),
+    'weight' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'info' => array(
+      'type' => 'text',
+      'not null' => FALSE,
+      'size' => 'normal',
+    ),
+  ),
+  'primary key' => array(
+    'filename',
+  ),
+  'indexes' => array(
+    'modules' => array(
+      array(
+        'type',
+        '12',
+      ),
+      'status',
+      'weight',
+      'filename',
+    ),
+    'bootstrap' => array(
+      array(
+        'type',
+        '12',
+      ),
+      'status',
+      'bootstrap',
+      'weight',
+      'filename',
+    ),
+    'type_name' => array(
+      array(
+        'type',
+        '12',
+      ),
+      'name',
+    ),
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('system')
+->fields(array(
+  'filename',
+  'name',
+  'type',
+  'owner',
+  'status',
+  'throttle',
+  'bootstrap',
+  'schema_version',
+  'weight',
+  'info',
+))
+->values(array(
+  'filename' => 'sites/all/modules/recipe/recipe.module',
+  'name' => 'recipe',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6104',
+  'weight' => '0',
+  'info' => 'a:8:{s:4:"name";s:6:"Recipe";s:11:"description";s:28:"Collect and display recipes.";s:12:"dependencies";a:1:{i:0;s:8:"taxonomy";}s:7:"package";s:6:"Recipe";s:4:"core";s:3:"6.x";s:10:"dependents";a:0:{}s:7:"version";N;s:3:"php";s:5:"4.3.5";}',
+))
+->execute();
+
+
+$connection->schema()->createTable('variable', array(
+  'fields' => array(
+    'name' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'value' => array(
+      'type' => 'text',
+      'not null' => TRUE,
+      'size' => 'big',
+    ),
+  ),
+  'primary key' => array(
+    'name',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('variable')
+->fields(array(
+  'name',
+  'value',
+))
+->values(array(
+  'name' => 'recipe_fraction_display',
+  'value' => 's:10:"{%d }%d/%d";',
+))
+->values(array(
+  'name' => 'recipe_ingredient_name_normalize',
+  'value' => 's:1:"1";',
+))
+->values(array(
+  'name' => 'recipe_unit_display',
+  'value' => 's:1:"1";',
+))
+->execute();
diff --git a/modules/ingredient/tests/fixtures/ingredient713.php b/modules/ingredient/tests/fixtures/ingredient71.php
similarity index 100%
rename from modules/ingredient/tests/fixtures/ingredient713.php
rename to modules/ingredient/tests/fixtures/ingredient71.php
diff --git a/modules/ingredient/tests/src/Kernel/Migrate/MigrateIngredient1xTestBase.php b/modules/ingredient/tests/src/Kernel/Migrate/MigrateIngredient1xTestBase.php
new file mode 100644
index 0000000..c2da949
--- /dev/null
+++ b/modules/ingredient/tests/src/Kernel/Migrate/MigrateIngredient1xTestBase.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\Tests\ingredient\Kernel\Migrate;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Provides a base for Ingredient migration tests from the Recipe 1.x branches.
+ */
+abstract class MigrateIngredient1xTestBase extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getFixtureFilePath() {
+    return __DIR__ . '/../../../fixtures/' . $this->getFixtureFileName();
+  }
+
+  /**
+   * Gets the file name of the fixture.
+   *
+   * @return string
+   *   The file name of the fixture to load, without the path.
+   */
+  abstract protected function getFixtureFileName();
+
+}
diff --git a/modules/ingredient/tests/src/Kernel/Migrate/recipe713/MigrateIngredientTest.php b/modules/ingredient/tests/src/Kernel/Migrate/MigrateIngredientEntity1xTestBase.php
similarity index 81%
rename from modules/ingredient/tests/src/Kernel/Migrate/recipe713/MigrateIngredientTest.php
rename to modules/ingredient/tests/src/Kernel/Migrate/MigrateIngredientEntity1xTestBase.php
index a90bf53..3feb29f 100644
--- a/modules/ingredient/tests/src/Kernel/Migrate/recipe713/MigrateIngredientTest.php
+++ b/modules/ingredient/tests/src/Kernel/Migrate/MigrateIngredientEntity1xTestBase.php
@@ -1,17 +1,15 @@
 <?php
 
-namespace Drupal\Tests\ingredient\Kernel\Migrate\recipe713;
+namespace Drupal\Tests\ingredient\Kernel\Migrate;
 
 use Drupal\Core\Database\Database;
 use Drupal\ingredient\Entity\Ingredient;
 use Drupal\ingredient\IngredientInterface;
 
 /**
- * Ingredients migration.
- *
- * @group recipe
+ * Provides a base class for Ingredient entity migration tests from Recipe 1.x.
  */
-class MigrateIngredientTest extends MigrateIngredient713TestBase {
+abstract class MigrateIngredientEntity1xTestBase extends MigrateIngredient1xTestBase {
 
   /**
    * {@inheritdoc}
@@ -24,7 +22,7 @@ class MigrateIngredientTest extends MigrateIngredient713TestBase {
   protected function setUp() {
     parent::setUp();
     $this->installEntitySchema('ingredient');
-    $this->executeMigrations(['recipe713_ingredient']);
+    $this->executeMigrations(['recipe1x_ingredient']);
   }
 
   /**
diff --git a/modules/ingredient/tests/src/Kernel/Migrate/recipe713/MigrateIngredientSettingsTest.php b/modules/ingredient/tests/src/Kernel/Migrate/MigrateIngredientSettings1xTestBase.php
similarity index 61%
rename from modules/ingredient/tests/src/Kernel/Migrate/recipe713/MigrateIngredientSettingsTest.php
rename to modules/ingredient/tests/src/Kernel/Migrate/MigrateIngredientSettings1xTestBase.php
index ed74568..e0a6091 100644
--- a/modules/ingredient/tests/src/Kernel/Migrate/recipe713/MigrateIngredientSettingsTest.php
+++ b/modules/ingredient/tests/src/Kernel/Migrate/MigrateIngredientSettings1xTestBase.php
@@ -1,13 +1,11 @@
 <?php
 
-namespace Drupal\Tests\ingredient\Kernel\Migrate\recipe713;
+namespace Drupal\Tests\ingredient\Kernel\Migrate;
 
 /**
- * Tests migration of Recipe's ingredient variables to configuration.
- *
- * @group recipe
+ * Provides a base class for Ingredient setting migration tests from Recipe 1.x.
  */
-class MigrateIngredientSettingsTest extends MigrateIngredient713TestBase {
+abstract class MigrateIngredientSettings1xTestBase extends MigrateIngredient1xTestBase {
 
   /**
    * {@inheritdoc}
@@ -20,7 +18,7 @@ class MigrateIngredientSettingsTest extends MigrateIngredient713TestBase {
   protected function setUp() {
     parent::setUp();
     $this->installConfig(static::$modules);
-    $this->executeMigrations(['recipe713_ingredient_settings']);
+    $this->executeMigrations(['recipe1x_ingredient_settings']);
   }
 
   /**
diff --git a/modules/ingredient/tests/src/Kernel/Migrate/recipe61/MigrateIngredientEntity61Test.php b/modules/ingredient/tests/src/Kernel/Migrate/recipe61/MigrateIngredientEntity61Test.php
new file mode 100644
index 0000000..482b247
--- /dev/null
+++ b/modules/ingredient/tests/src/Kernel/Migrate/recipe61/MigrateIngredientEntity61Test.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Drupal\Tests\ingredient\Kernel\Migrate\recipe61;
+
+use Drupal\Tests\ingredient\Kernel\Migrate\MigrateIngredientEntity1xTestBase;
+
+/**
+ * Tests migration of Recipe 6.x-1.x ingredients to entities.
+ *
+ * @group recipe
+ */
+class MigrateIngredientEntity61Test extends MigrateIngredientEntity1xTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getFixtureFileName() {
+    return 'ingredient61.php';
+  }
+
+}
diff --git a/modules/ingredient/tests/src/Kernel/Migrate/recipe61/MigrateIngredientSettings61Test.php b/modules/ingredient/tests/src/Kernel/Migrate/recipe61/MigrateIngredientSettings61Test.php
new file mode 100644
index 0000000..7a6cc5f
--- /dev/null
+++ b/modules/ingredient/tests/src/Kernel/Migrate/recipe61/MigrateIngredientSettings61Test.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Drupal\Tests\ingredient\Kernel\Migrate\recipe61;
+
+use Drupal\Tests\ingredient\Kernel\Migrate\MigrateIngredientSettings1xTestBase;
+
+/**
+ * Tests migration of Recipe 6.x-1.x ingredient variables to configuration.
+ *
+ * @group recipe
+ */
+class MigrateIngredientSettings61Test extends MigrateIngredientSettings1xTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getFixtureFileName() {
+    return 'ingredient61.php';
+  }
+
+}
diff --git a/modules/ingredient/tests/src/Kernel/Migrate/recipe71/MigrateIngredientEntity71Test.php b/modules/ingredient/tests/src/Kernel/Migrate/recipe71/MigrateIngredientEntity71Test.php
new file mode 100644
index 0000000..a1b4eeb
--- /dev/null
+++ b/modules/ingredient/tests/src/Kernel/Migrate/recipe71/MigrateIngredientEntity71Test.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Drupal\Tests\ingredient\Kernel\Migrate\recipe71;
+
+use Drupal\Tests\ingredient\Kernel\Migrate\MigrateIngredientEntity1xTestBase;
+
+/**
+ * Tests migration of Recipe 7.x-1.x ingredients to entities.
+ *
+ * @group recipe
+ */
+class MigrateIngredientEntity71Test extends MigrateIngredientEntity1xTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getFixtureFileName() {
+    return 'ingredient71.php';
+  }
+
+}
diff --git a/modules/ingredient/tests/src/Kernel/Migrate/recipe71/MigrateIngredientSettings71Test.php b/modules/ingredient/tests/src/Kernel/Migrate/recipe71/MigrateIngredientSettings71Test.php
new file mode 100644
index 0000000..b1a82b8
--- /dev/null
+++ b/modules/ingredient/tests/src/Kernel/Migrate/recipe71/MigrateIngredientSettings71Test.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Drupal\Tests\ingredient\Kernel\Migrate\recipe71;
+
+use Drupal\Tests\ingredient\Kernel\Migrate\MigrateIngredientSettings1xTestBase;
+
+/**
+ * Tests migration of Recipe 7.x-1.x ingredient variables to configuration.
+ *
+ * @group recipe
+ */
+class MigrateIngredientSettings71Test extends MigrateIngredientSettings1xTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getFixtureFileName() {
+    return 'ingredient71.php';
+  }
+
+}
diff --git a/modules/ingredient/tests/src/Kernel/Migrate/recipe713/MigrateIngredient713TestBase.php b/modules/ingredient/tests/src/Kernel/Migrate/recipe713/MigrateIngredient713TestBase.php
deleted file mode 100644
index 49624b6..0000000
--- a/modules/ingredient/tests/src/Kernel/Migrate/recipe713/MigrateIngredient713TestBase.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ingredient\Kernel\Migrate\recipe713;
-
-use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
-
-/**
- * Provides a base class for Ingredient migrations from Recipe 7.x-1.3.
- */
-abstract class MigrateIngredient713TestBase extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getFixtureFilePath() {
-    return __DIR__ . '/../../../../fixtures/ingredient713.php';
-  }
-
-}