diff --git a/modules/ubercart/commerce_migrate_ubercart.info.yml b/modules/ubercart/commerce_migrate_ubercart.info.yml
index 61b8d04..b6b333a 100644
--- a/modules/ubercart/commerce_migrate_ubercart.info.yml
+++ b/modules/ubercart/commerce_migrate_ubercart.info.yml
@@ -8,4 +8,3 @@ dependencies:
   - drupal:migrate_drupal
   - profile:profile
   - commerce_migrate:commerce_migrate
-
diff --git a/modules/ubercart/commerce_migrate_ubercart.info.yml b/modules/ubercart/modules/ubercart_shipping/commerce_migrate_ubercart_shipping.info.yml
similarity index 59%
copy from modules/ubercart/commerce_migrate_ubercart.info.yml
copy to modules/ubercart/modules/ubercart_shipping/commerce_migrate_ubercart_shipping.info.yml
index 61b8d04..8358fb2 100644
--- a/modules/ubercart/commerce_migrate_ubercart.info.yml
+++ b/modules/ubercart/modules/ubercart_shipping/commerce_migrate_ubercart_shipping.info.yml
@@ -1,4 +1,4 @@
-name: Commerce Migrate Ubercart
+name: Commerce Migrate Ubercart Shipping
 type: module
 description: Provides migrations for Ubercart.
 core: 8.x
@@ -8,4 +8,6 @@ dependencies:
   - drupal:migrate_drupal
   - profile:profile
   - commerce_migrate:commerce_migrate
-
+  - commerce_migrate:commerce_migrate_ubercart
+  - commerce_shipping:commerce_shipping
+  - physical:physical
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderShippingTest.php b/modules/ubercart/modules/ubercart_shipping/tests/src/Kernel/Migrate/d6/OrderShippingTest.php
similarity index 89%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/OrderShippingTest.php
rename to modules/ubercart/modules/ubercart_shipping/tests/src/Kernel/Migrate/d6/OrderShippingTest.php
index 27f532a..ddee812 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderShippingTest.php
+++ b/modules/ubercart/modules/ubercart_shipping/tests/src/Kernel/Migrate/d6/OrderShippingTest.php
@@ -1,17 +1,16 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
+namespace Drupal\Tests\commerce_migrate_ubercart_shipping\Kernel\Migrate\d6;
 
 use Drupal\commerce_order\Adjustment;
 use Drupal\commerce_price\Price;
 use Drupal\commerce_order\Entity\Order;
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6\Ubercart6TestBase;
 
 /**
  * Tests order migration.
  *
- * @requires module commerce_shipping
- * @requires module physical
  * @group commerce_migrate
  */
 class OrderShippingTest extends Ubercart6TestBase {
@@ -52,8 +51,11 @@ class OrderShippingTest extends Ubercart6TestBase {
 
   /**
    * Test order migration from Drupal 6 to 8.
+   *
+   * @requires module commerce_shipping
+   * @requires module physical
    */
-  public function testOrder() {
+  public function testShippingOrder() {
     $this->assertOrder(1, '1', '1', '1492868907', '1493078815', 'fordprefect@example.com', 'validation', '10.1.1.2', '3', '1493078815');
     $this->assertOrder(2, '2', '1', '1492989920', '1493081092', 'trintragula@example.com', 'validation', '10.1.1.2', '5', '1493081092');