reverted:
--- b/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductVariationLanguageContentSettings.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
-
-use Drupal\language\Entity\ContentLanguageSettings;
-
-/**
- * Tests migration of language content setting variables.
- *
- * The variables are language_content_type_$type, i18n_node_options_* and
- * i18n_lock_node_*.
- *
- * @requires migrate_plus
- *
- * @group commerce_migrate
- * @group commerce_migrate_ubercart_d6
- */
-class MigrateProductVariationLanguageContentSettingsTest extends Ubercart6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules =
-    [
-      'content_translation',
-      'language',
-      'menu_ui',
-      'path',
-      'commerce_product',
-      'migrate_plus',
-    ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('commerce_product');
-    $this->installEntitySchema('commerce_product_variation');
-    $this->installConfig(['node']);
-    $this->installConfig(['commerce_product']);
-    $this->executeMigrations([
-      'd6_ubercart_product_type',
-      'd6_ubercart_product_variation_type',
-      'd6_ubercart_product_variation_language_content_settings',
-    ]);
-  }
-
-  /**
-   * Tests migration of content language settings.
-   */
-  public function testLanguageContent() {
-    // Commerce products.
-    $config = ContentLanguageSettings::loadByEntityTypeBundle('commerce_product_variation', 'product');
-    $this->assertSame('commerce_product_variation', $config->getTargetEntityTypeId());
-    $this->assertSame('product', $config->getTargetBundle());
-    $this->assertSame('current_interface', $config->getDefaultLangcode());
-    $this->assertTrue($config->getThirdPartySetting('content_translation', 'enabled'));
-    $this->assertFalse($config->isDefaultConfiguration());
-    $this->assertTrue($config->isLanguageAlterable());
-
-    $config = ContentLanguageSettings::loadByEntityTypeBundle('commerce_product_variation', 'ship');
-    $this->assertSame('commerce_product_variation', $config->getTargetEntityTypeId());
-    $this->assertSame('ship', $config->getTargetBundle());
-    $this->assertSame('site_default', $config->getDefaultLangcode());
-    $this->assertNull($config->getThirdPartySetting('content_translation', 'enabled'));
-    $this->assertTrue($config->isDefaultConfiguration());
-    $this->assertFalse($config->isLanguageAlterable());
-
-    $config = ContentLanguageSettings::loadByEntityTypeBundle('commerce_product_variation', 'default');
-    $this->assertSame('commerce_product_variation', $config->getTargetEntityTypeId());
-    $this->assertSame('default', $config->getTargetBundle());
-    $this->assertSame('site_default', $config->getDefaultLangcode());
-    $this->assertNull($config->getThirdPartySetting('content_translation', 'enabled'));
-    $this->assertTrue($config->isDefaultConfiguration());
-    $this->assertFalse($config->isLanguageAlterable());
-  }
-
-}
reverted:
--- b/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductVariationTypeTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
-
-use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
-
-/**
- * Tests product variation type migration.
- *
- * @group commerce_migrate
- * @group commerce_migrate_ubercart_d6
- */
-class ProductVariationTypeTest extends Ubercart6TestBase {
-
-  use CommerceMigrateTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'path',
-    'inline_entity_form',
-    'commerce_product',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('view');
-    $this->installEntitySchema('commerce_product_variation');
-    $this->executeMigration('d6_ubercart_product_variation_type');
-  }
-
-  /**
-   * Test product variation type migration from Drupal 7 to 8.
-   *
-   * Product variation types in Drupal 8 are product types in Drupal 7.
-   */
-  public function testProductVariationType() {
-    $type = [
-      'id' => 'product',
-      'label' => 'Product',
-      'order_item_type_id' => 'default',
-      'is_title_generated' => FALSE,
-    ];
-    $this->assertProductVariationTypeEntity($type['id'], $type['label'], $type['order_item_type_id'], $type['is_title_generated']);
-    $type = [
-      'id' => 'product_kit',
-      'label' => 'Product kit',
-      'order_item_type_id' => 'default',
-      'is_title_generated' => FALSE,
-    ];
-    $this->assertProductVariationTypeEntity($type['id'], $type['label'], $type['order_item_type_id'], $type['is_title_generated']);
-    $type = [
-      'id' => 'ship',
-      'label' => 'Ship',
-      'order_item_type_id' => 'default',
-      'is_title_generated' => FALSE,
-    ];
-    $this->assertProductVariationTypeEntity($type['id'], $type['label'], $type['order_item_type_id'], $type['is_title_generated']);
-  }
-
-}
only in patch2:
unchanged:
--- /dev/null
+++ b/modules/ubercart/tests/src/Kernel/Migrate/uc6/ProductVariationLanguageContentSettings.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\uc6;
+
+use Drupal\language\Entity\ContentLanguageSettings;
+
+/**
+ * Tests migration of language content setting variables.
+ *
+ * The variables are language_content_type_$type, i18n_node_options_* and
+ * i18n_lock_node_*.
+ *
+ * @requires migrate_plus
+ *
+ * @group commerce_migrate
+ * @group commerce_migrate_uc6
+ */
+class MigrateProductVariationLanguageContentSettingsTest extends Ubercart6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules =
+    [
+      'content_translation',
+      'language',
+      'menu_ui',
+      'path',
+      'commerce_product',
+      'migrate_plus',
+    ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('commerce_product');
+    $this->installEntitySchema('commerce_product_variation');
+    $this->installConfig(['node']);
+    $this->installConfig(['commerce_product']);
+    $this->executeMigrations([
+      'uc6_product_type',
+      'uc6_product_variation_type',
+      'uc6_product_variation_language_content_settings',
+    ]);
+  }
+
+  /**
+   * Tests migration of content language settings.
+   */
+  public function testLanguageContent() {
+    // Commerce products.
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('commerce_product_variation', 'product');
+    $this->assertSame('commerce_product_variation', $config->getTargetEntityTypeId());
+    $this->assertSame('product', $config->getTargetBundle());
+    $this->assertSame('current_interface', $config->getDefaultLangcode());
+    $this->assertTrue($config->getThirdPartySetting('content_translation', 'enabled'));
+    $this->assertFalse($config->isDefaultConfiguration());
+    $this->assertTrue($config->isLanguageAlterable());
+
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('commerce_product_variation', 'ship');
+    $this->assertSame('commerce_product_variation', $config->getTargetEntityTypeId());
+    $this->assertSame('ship', $config->getTargetBundle());
+    $this->assertSame('site_default', $config->getDefaultLangcode());
+    $this->assertNull($config->getThirdPartySetting('content_translation', 'enabled'));
+    $this->assertTrue($config->isDefaultConfiguration());
+    $this->assertFalse($config->isLanguageAlterable());
+
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('commerce_product_variation', 'default');
+    $this->assertSame('commerce_product_variation', $config->getTargetEntityTypeId());
+    $this->assertSame('default', $config->getTargetBundle());
+    $this->assertSame('site_default', $config->getDefaultLangcode());
+    $this->assertNull($config->getThirdPartySetting('content_translation', 'enabled'));
+    $this->assertTrue($config->isDefaultConfiguration());
+    $this->assertFalse($config->isLanguageAlterable());
+  }
+
+}
only in patch2:
unchanged:
--- /dev/null
+++ b/modules/ubercart/tests/src/Kernel/Migrate/uc6/ProductVariationTypeTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\uc6;
+
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
+
+/**
+ * Tests product variation type migration.
+ *
+ * @group commerce_migrate
+ * @group commerce_migrate_uc6
+ */
+class ProductVariationTypeTest extends Ubercart6TestBase {
+
+  use CommerceMigrateTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'path',
+    'inline_entity_form',
+    'commerce_product',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('view');
+    $this->installEntitySchema('commerce_product_variation');
+    $this->executeMigration('uc6_product_variation_type');
+  }
+
+  /**
+   * Test product variation type migration from Ubercart 6 to 8.
+   *
+   * Product variation types in Drupal 8 are product types in Ubercart 6.
+   */
+  public function testProductVariationType() {
+    $type = [
+      'id' => 'product',
+      'label' => 'Product',
+      'order_item_type_id' => 'default',
+      'is_title_generated' => FALSE,
+    ];
+    $this->assertProductVariationTypeEntity($type['id'], $type['label'], $type['order_item_type_id'], $type['is_title_generated']);
+    $type = [
+      'id' => 'product_kit',
+      'label' => 'Product kit',
+      'order_item_type_id' => 'default',
+      'is_title_generated' => FALSE,
+    ];
+    $this->assertProductVariationTypeEntity($type['id'], $type['label'], $type['order_item_type_id'], $type['is_title_generated']);
+    $type = [
+      'id' => 'ship',
+      'label' => 'Ship',
+      'order_item_type_id' => 'default',
+      'is_title_generated' => FALSE,
+    ];
+    $this->assertProductVariationTypeEntity($type['id'], $type['label'], $type['order_item_type_id'], $type['is_title_generated']);
+  }
+
+}