diff --git a/tests/src/Functional/ManagePaymentMethodsTest.php b/tests/src/Functional/ManagePaymentMethodsTest.php
index 50136c0..e2d6b23 100644
--- a/tests/src/Functional/ManagePaymentMethodsTest.php
+++ b/tests/src/Functional/ManagePaymentMethodsTest.php
@@ -40,7 +40,7 @@ class ManagePaymentMethodsTest extends CommerceBrowserTestBase {
    */
   protected function getAdministratorPermissions() {
     return array_merge([
-      'administer commerce_payment',
+      'administer commerce_payment_method',
     ], parent::getAdministratorPermissions());
   }
 
@@ -91,12 +91,12 @@ class ManagePaymentMethodsTest extends CommerceBrowserTestBase {
       'payment_method[payment_details][expiration][month]' => '2',
       'payment_method[payment_details][expiration][year]' => '2020',
       'payment_method[payment_details][security_code]' => '123',
-      'payment_method[billing_information][address][0][given_name]' => 'Johnny',
-      'payment_method[billing_information][address][0][family_name]' => 'Appleseed',
-      'payment_method[billing_information][address][0][address_line1]' => '123 New York Drive',
-      'payment_method[billing_information][address][0][locality]' => 'New York City',
-      'payment_method[billing_information][address][0][administrative_area]' => 'NY',
-      'payment_method[billing_information][address][0][postal_code]' => '10001',
+      'payment_method[billing_information][address][0][address][given_name]' => 'Johnny',
+      'payment_method[billing_information][address][0][address][family_name]' => 'Appleseed',
+      'payment_method[billing_information][address][0][address][address_line1]' => '123 New York Drive',
+      'payment_method[billing_information][address][0][address][locality]' => 'New York City',
+      'payment_method[billing_information][address][0][address][administrative_area]' => 'NY',
+      'payment_method[billing_information][address][0][address][postal_code]' => '10001',
     ], 'Save');
     $this->assertSession()->pageTextNotContains('We encountered an error processing your payment method. Please verify your details and try again.');
     $this->assertSession()->pageTextNotContains('We encountered an unexpected error processing your payment method. Please try again later.');
diff --git a/tests/src/FunctionalJavascript/CheckoutTest.php b/tests/src/FunctionalJavascript/CheckoutTest.php
index feb798f..446c5af 100644
--- a/tests/src/FunctionalJavascript/CheckoutTest.php
+++ b/tests/src/FunctionalJavascript/CheckoutTest.php
@@ -79,6 +79,7 @@ class CheckoutTest extends CommerceBrowserTestBase {
       'transaction_key' => '346HZ32z3fP4hTG2',
       'mode' => 'test',
       'payment_method_types' => ['credit_card'],
+      'client_key' => 'test-client-key',
     ]);
     $gateway->save();
 
@@ -108,7 +109,7 @@ class CheckoutTest extends CommerceBrowserTestBase {
     $this->submitForm([
       'contact_information[email]' => 'guest@example.com',
       'contact_information[email_confirm]' => 'guest@example.com',
-      'payment_information[add_payment_method][payment_details][credit_card_number]' => '411111111111111',
+      'payment_information[add_payment_method][payment_details][number]' => '411111111111111',
       'payment_information[add_payment_method][payment_details][expiration][month]' => '02',
       'payment_information[add_payment_method][payment_details][expiration][year]' => '2020',
       'payment_information[add_payment_method][payment_details][security_code]' => '123',
@@ -147,7 +148,7 @@ class CheckoutTest extends CommerceBrowserTestBase {
     $this->submitForm([], 'Checkout');
     $this->assertSession()->pageTextContains('Order Summary');
     $this->submitForm([
-      'payment_information[add_payment_method][payment_details][credit_card_number]' => '4111111111111111',
+      'payment_information[add_payment_method][payment_details][number]' => '4111111111111111',
       'payment_information[add_payment_method][payment_details][expiration][month]' => '02',
       'payment_information[add_payment_method][payment_details][expiration][year]' => '2020',
       'payment_information[add_payment_method][payment_details][security_code]' => '123',