diff --git a/payment_ubercart.module b/payment_ubercart.module
index b1b03ee..2e15eb0 100644
--- a/payment_ubercart.module
+++ b/payment_ubercart.module
@@ -106,11 +106,12 @@ function payment_ubercart_checkout_form_submit($form, &$form_state) {
  */
 function payment_ubercart_uc_payment_method() {
   $uc_payment_methods = array();
-  foreach (entity_load('payment_method') as $payment_method) {
-    if ($payment_method->enabled) {
-      $uc_payment_methods['payment_ubercart_' . $payment_method->pmid] = array(
-        'title' => $payment_method->title_generic,
-        'name' => $payment_method->title_specific,
+  $payment_methods = \Drupal::entityTypeManager()->getStorage('payment_method_configuration')->loadMultiple();
+  foreach ($payment_methods as $payment_method) {
+    if ($payment_method->status()) {
+      $uc_payment_methods['payment_ubercart_' . $payment_method->id()] = array(
+        'title' => $payment_method->label(),
+        'name' => $payment_method->label(),
         'callback' => 'payment_ubercart_callback',
         'checkout' => TRUE,
         'weight' => 1,
diff --git a/src/Tests/UbercartTest.php b/src/Tests/UbercartTest.php
index 0c4b650..2c500f9 100644
--- a/src/Tests/UbercartTest.php
+++ b/src/Tests/UbercartTest.php
@@ -17,16 +17,41 @@ use Drupal\uc_store\Tests\UbercartTestBase;
 class UbercartTest extends UbercartTestBase {
 
   /**
+   * A user with permission to administer store.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
    * Modules to enable.
    *
    * @var array
    */
   public static $modules = array('payment', 'payment_ubercart', 'uc_payment');
 
+  protected function setUp() {
+    parent::setUp();
+
+    $this->adminUser = $this->drupalCreateUser(array('administer store'));
+  }
+
   /**
    * Test module install.
    */
   function testPaymentMethod() {
+    $payment_method = \Drupal::entityTypeManager()->getStorage('payment_method_configuration')->create(array(
+      'id' => $this->randomMachineName(8),
+      'label' => $this->randomMachineName(8),
+      'ownerId' => 1,
+      'pluginId' => 'payment_basic',
+      'status' => TRUE,
+    ));
+    $payment_method->save();
+
+    $this->drupalLogin($this->adminUser);
+    $this->drupalGet('admin/store/config/payment');
+    $this->assertText($payment_method->label());
   }
 
 }