diff --git a/tests/Browser/ClientPortal/Gateways/Braintree/CreditCardTest.php b/tests/Browser/ClientPortal/Gateways/Braintree/CreditCardTest.php
index f725521e77f5..f1077184fc70 100644
--- a/tests/Browser/ClientPortal/Gateways/Braintree/CreditCardTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Braintree/CreditCardTest.php
@@ -35,6 +35,10 @@ class CreditCardTest extends DuskTestCase
                 ->auth();
         });
 
+        $this->disableCompanyGateways();
+
+        CompanyGateway::where('gateway_key', 'f7ec488676d310683fb51802d076d713')->restore();
+
         $cg = CompanyGateway::where('gateway_key', 'f7ec488676d310683fb51802d076d713')->firstOrFail();
         $fees_and_limits = $cg->fees_and_limits;
         $fees_and_limits->{GatewayType::CREDIT_CARD} = new FeesAndLimits();
@@ -51,7 +55,6 @@ class CreditCardTest extends DuskTestCase
                 ->press('Pay Now')
                 ->clickLink('Credit Card')
                 ->waitFor('#braintree-hosted-field-number', 60)
-                ->waitFor('##braintree-hosted-field-expirationDate', 60)
                 ->withinFrame('#braintree-hosted-field-number', function (Browser $browser) {
                     $browser->type('credit-card-number', '4111111111111111');
                 })
diff --git a/tests/Browser/ClientPortal/Gateways/Braintree/PayPalTest.php b/tests/Browser/ClientPortal/Gateways/Braintree/PayPalTest.php
index e27cc9eac7d4..031d0c4a2e21 100644
--- a/tests/Browser/ClientPortal/Gateways/Braintree/PayPalTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Braintree/PayPalTest.php
@@ -12,6 +12,7 @@
 
 namespace Tests\Browser\ClientPortal\Gateways\Braintree;
 
+use App\Models\CompanyGateway;
 use Laravel\Dusk\Browser;
 use Tests\Browser\Pages\ClientPortal\Login;
 use Tests\DuskTestCase;
@@ -31,6 +32,10 @@ class PayPalTest extends DuskTestCase
                 ->visit(new Login())
                 ->auth();
         });
+
+        $this->disableCompanyGateways();
+
+        CompanyGateway::where('gateway_key', 'f7ec488676d310683fb51802d076d713')->restore();
     }
 
     public function testOffsitePayment()