diff --git a/tests/Browser/ClientPortal/Gateways/Stripe/ACSSTest.php b/tests/Browser/ClientPortal/Gateways/Stripe/ACSSTest.php
index f1a081ffe3d5..a0f349b0404a 100644
--- a/tests/Browser/ClientPortal/Gateways/Stripe/ACSSTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Stripe/ACSSTest.php
@@ -48,10 +48,8 @@ class ACSSTest extends DuskTestCase
         $cg->fees_and_limits = $fees_and_limits;
         $cg->save();
 
-        // SOFORT required ['AUT', 'BEL', 'DEU', 'ITA', 'NLD', 'ESP'] to be billing country.
-        // Setting country  to DEU (276).
         $client = Client::first();
-        $client->country_id = 276;
+        $client->country_id = 276; // Change to US or Canada
         $client->save();
     }
 
@@ -63,8 +61,13 @@ class ACSSTest extends DuskTestCase
                 ->click('@pay-now')
                 ->press('Pay Now')
                 ->clickLink('ACSS')
-                ->press('Pay Now')
-                ->waitForText('Sofort test payment page', 120)
+                ->type('#acss-name', 'John Doe')
+                ->type('#acss-name', 'John@Doe.com')
+                ->withinFrame('iframe', function (Browser $browser) {
+                    $browser->type('acss', '12345');
+                })
+                ->click('#pay-now')
+                ->waitForText('ACSS test payment page', 120)
                 ->press('.common-Button.common-Button--default')
                 ->waitForText('Details of the payment', 60);
         });
diff --git a/tests/Browser/ClientPortal/Gateways/Stripe/BECSTest.php b/tests/Browser/ClientPortal/Gateways/Stripe/BECSTest.php
index 13efce58da9c..388e94bf93e4 100644
--- a/tests/Browser/ClientPortal/Gateways/Stripe/BECSTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Stripe/BECSTest.php
@@ -48,10 +48,8 @@ class BECSTest extends DuskTestCase
         $cg->fees_and_limits = $fees_and_limits;
         $cg->save();
 
-        // SOFORT required ['AUT', 'BEL', 'DEU', 'ITA', 'NLD', 'ESP'] to be billing country.
-        // Setting country  to DEU (276).
         $client = Client::first();
-        $client->country_id = 276;
+        $client->country_id = 276; // Change to austria
         $client->save();
     }
 
@@ -63,8 +61,13 @@ class BECSTest extends DuskTestCase
                 ->click('@pay-now')
                 ->press('Pay Now')
                 ->clickLink('BECS')
-                ->press('Pay Now')
-                ->waitForText('Sofort test payment page', 120)
+                ->type('#becs-name', 'John Doe')
+                ->type('#becs-email', 'john@doe.com')
+                ->withinFrame('iframe', function (Browser $browser) {
+                    $browser->type('becs-iban', '000123456');
+                })
+                ->click('#pay-now')
+                ->waitForText('BECS test payment page', 120)
                 ->press('.common-Button.common-Button--default')
                 ->waitForText('Details of the payment', 60);
         });
diff --git a/tests/Browser/ClientPortal/Gateways/Stripe/BancontactTest.php b/tests/Browser/ClientPortal/Gateways/Stripe/BancontactTest.php
index 9611214ae88f..8a517cd0d29a 100644
--- a/tests/Browser/ClientPortal/Gateways/Stripe/BancontactTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Stripe/BancontactTest.php
@@ -48,8 +48,6 @@ class BancontactTest extends DuskTestCase
         $cg->fees_and_limits = $fees_and_limits;
         $cg->save();
 
-        // SOFORT required ['AUT', 'BEL', 'DEU', 'ITA', 'NLD', 'ESP'] to be billing country.
-        // Setting country  to DEU (276).
         $client = Client::first();
         $client->country_id = 276;
         $client->save();
@@ -62,11 +60,11 @@ class BancontactTest extends DuskTestCase
                 ->visitRoute('client.invoices.index')
                 ->click('@pay-now')
                 ->press('Pay Now')
-                ->clickLink('Bancontact')
-                ->press('Pay Now')
-                ->waitForText('Sofort test payment page', 120)
+                ->clickLink('EPS')
+                ->type('#bancontact-name', 'John Doe')
+                ->click('#pay-now')
+                ->waitForText('Bancontact test payment page', 120)
                 ->press('.common-Button.common-Button--default')
                 ->waitForText('Details of the payment', 60);
         });
-    }
-}
+}}
diff --git a/tests/Browser/ClientPortal/Gateways/Stripe/GiropayTest.php b/tests/Browser/ClientPortal/Gateways/Stripe/GiropayTest.php
index 9ad7b78b1fda..469e4d15b7b9 100644
--- a/tests/Browser/ClientPortal/Gateways/Stripe/GiropayTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Stripe/GiropayTest.php
@@ -48,8 +48,6 @@ class GiropayTest extends DuskTestCase
         $cg->fees_and_limits = $fees_and_limits;
         $cg->save();
 
-        // SOFORT required ['AUT', 'BEL', 'DEU', 'ITA', 'NLD', 'ESP'] to be billing country.
-        // Setting country  to DEU (276).
         $client = Client::first();
         $client->country_id = 276;
         $client->save();
@@ -63,8 +61,9 @@ class GiropayTest extends DuskTestCase
                 ->click('@pay-now')
                 ->press('Pay Now')
                 ->clickLink('Giropay')
-                ->press('Pay Now')
-                ->waitForText('Sofort test payment page', 120)
+                ->type('#giropay-name', 'John Doe')
+                ->click('#pay-now')
+                ->waitForText('Giropay test payment page', 120)
                 ->press('.common-Button.common-Button--default')
                 ->waitForText('Details of the payment', 60);
         });
diff --git a/tests/Browser/ClientPortal/Gateways/Stripe/Prezelewy24Test.php b/tests/Browser/ClientPortal/Gateways/Stripe/Prezelewy24Test.php
index dbd9f3872621..a0b3f4a2a23f 100644
--- a/tests/Browser/ClientPortal/Gateways/Stripe/Prezelewy24Test.php
+++ b/tests/Browser/ClientPortal/Gateways/Stripe/Prezelewy24Test.php
@@ -48,8 +48,6 @@ class Prezelewy24Test extends DuskTestCase
         $cg->fees_and_limits = $fees_and_limits;
         $cg->save();
 
-        // SOFORT required ['AUT', 'BEL', 'DEU', 'ITA', 'NLD', 'ESP'] to be billing country.
-        // Setting country  to DEU (276).
         $client = Client::first();
         $client->country_id = 276;
         $client->save();
@@ -62,9 +60,15 @@ class Prezelewy24Test extends DuskTestCase
                 ->visitRoute('client.invoices.index')
                 ->click('@pay-now')
                 ->press('Pay Now')
-                ->clickLink('Prezelewy24')
-                ->press('Pay Now')
-                ->waitForText('Sofort test payment page', 120)
+                ->clickLink('EPS')
+                ->type('#eps-name', 'John Doe')
+                ->type('#eps-email', 'john@doe.com')
+                ->check('#p24-mandate-acceptance', 'John Doe')
+                ->withinFrame('iframe', function (Browser $browser) {
+                    $browser->type('p24', '12345');
+                })
+                ->click('#pay-now')
+                ->waitForText('P24 test payment page', 120)
                 ->press('.common-Button.common-Button--default')
                 ->waitForText('Details of the payment', 60);
         });
diff --git a/tests/Browser/ClientPortal/Gateways/Stripe/iDEAL.php b/tests/Browser/ClientPortal/Gateways/Stripe/iDEAL.php
index 8720aa4bd527..a9a6549e290b 100644
--- a/tests/Browser/ClientPortal/Gateways/Stripe/iDEAL.php
+++ b/tests/Browser/ClientPortal/Gateways/Stripe/iDEAL.php
@@ -48,8 +48,6 @@ class iDEAL extends DuskTestCase
         $cg->fees_and_limits = $fees_and_limits;
         $cg->save();
 
-        // SOFORT required ['AUT', 'BEL', 'DEU', 'ITA', 'NLD', 'ESP'] to be billing country.
-        // Setting country  to DEU (276).
         $client = Client::first();
         $client->country_id = 276;
         $client->save();
@@ -63,8 +61,12 @@ class iDEAL extends DuskTestCase
                 ->click('@pay-now')
                 ->press('Pay Now')
                 ->clickLink('iDeal')
-                ->press('Pay Now')
-                ->waitForText('Sofort test payment page', 120)
+                ->type('#ideal-name', 'John Doe')
+                ->withinFrame('iframe', function (Browser $browser) {
+                    $browser->type('ideal', '12345');
+                })
+                ->click('#pay-now')
+                ->waitForText('iDeal test payment page', 120)
                 ->press('.common-Button.common-Button--default')
                 ->waitForText('Details of the payment', 60);
         });