diff -u b/modules/ubercart/migration_templates/d6_ubercart_order_payment.yml b/modules/ubercart/migration_templates/d6_ubercart_order_payment.yml
--- b/modules/ubercart/migration_templates/d6_ubercart_order_payment.yml
+++ b/modules/ubercart/migration_templates/d6_ubercart_order_payment.yml
@@ -32 +32 @@
-    - d6_ubercart_payment_gateways
+    - d6_ubercart_payment_gateway
diff -u b/modules/ubercart/migration_templates/d6_ubercart_payment_gateway.yml b/modules/ubercart/migration_templates/d6_ubercart_payment_gateway.yml
--- b/modules/ubercart/migration_templates/d6_ubercart_payment_gateway.yml
+++ b/modules/ubercart/migration_templates/d6_ubercart_payment_gateway.yml
@@ -27,0 +28 @@
+  destination_module: commerce_payment_gateway
diff -u b/modules/ubercart/src/Plugin/migrate/source/d6/Payment.php b/modules/ubercart/src/Plugin/migrate/source/d6/Payment.php
--- b/modules/ubercart/src/Plugin/migrate/source/d6/Payment.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/Payment.php
@@ -3,7 +3,6 @@
 namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
-use Drupal\migrate\Row;
 
 /**
  * Drupal 6 ubercart payment gateway source.
diff -u b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigratePaymentTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigratePaymentTest.php
--- b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigratePaymentTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigratePaymentTest.php
@@ -8,6 +8,8 @@
 /**
  * Tests payment migration.
  *
+ * @requires module migrate_plus
+ *
  * @group commerce_migrate
  * @group commerce_migrate_ubercart_d6
  */
@@ -25,6 +27,7 @@
     'commerce_product',
     'commerce_payment',
     'commerce_payment_example',
+    'migrate_plus',
   ];
 
   /**
diff -u b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/PaymentTest.php b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/PaymentTest.php
--- b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/PaymentTest.php
+++ b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/PaymentTest.php
@@ -7,9 +7,10 @@
 /**
  * Tests Ubercart D6 payment source plugin.
  *
- * @covers Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6\Payment
+ * @covers \Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6\Payment
  *
  * @group commerce_migrate
+ * @group commerce_migrate_ubercart_d6
  */
 class PaymentTest extends MigrateSqlSourceTestBase {