diff --git a/tests/e2e/config/default.json b/tests/e2e/config/default.json
index a0e6569d2d6..48f3896fcb6 100644
--- a/tests/e2e/config/default.json
+++ b/tests/e2e/config/default.json
@@ -74,6 +74,32 @@
         "email": "e2e-wcpay-customer@woo.com"
       }
     },
+    "upe-customer": {
+      "billing": {
+        "be": {
+          "firstname": "I am",
+          "lastname": "Customer",
+          "company": "Automattic",
+          "country": "Belgium",
+          "addressfirstline": "Rue de l’Étuve, 1000",
+          "addresssecondline": "billing-be",
+          "city": "Bruxelles",
+          "phone": "123456789",
+          "email": "e2e-wcpay-customer@woo.com"
+        },
+        "de": {
+          "firstname": "I am",
+          "lastname": "Customer",
+          "company": "Automattic",
+          "country": "Germany",
+          "addressfirstline": "Petuelring 130",
+          "addresssecondline": "billing-de",
+          "city": "München",
+          "phone": "123456789",
+          "email": "e2e-wcpay-customer@woo.com"
+        }
+      }
+    },
     "subscriptions-customer": {
       "billing": {
         "firstname": "I am",
diff --git a/tests/e2e/specs/wcpay/shopper/shopper-checkout-purchase-with-upe-methods.spec.js b/tests/e2e/specs/wcpay/shopper/shopper-checkout-purchase-with-upe-methods.spec.js
index 3f122226c13..d1f225c1c43 100644
--- a/tests/e2e/specs/wcpay/shopper/shopper-checkout-purchase-with-upe-methods.spec.js
+++ b/tests/e2e/specs/wcpay/shopper/shopper-checkout-purchase-with-upe-methods.spec.js
@@ -41,8 +41,9 @@ describe( 'Enabled UPE with deferred intent creation', () => {
 	describe( 'Enabled UPE with deferred intent creation', () => {
 		it( 'should successfully place order with Giropay', async () => {
 			await setupProductCheckout(
-				config.get( 'addresses.customer.billing' )
+				config.get( 'addresses.upe-customer.billing.de' )
 			);
+			page.waitFor( 1000 );
 			await selectOnCheckout( 'giropay', page );
 			await shopper.placeOrder();
 			await completeRedirectedPayment( page, 'success' );
@@ -54,8 +55,9 @@ describe( 'Enabled UPE with deferred intent creation', () => {
 
 		it( 'should successfully place order with Bancontact', async () => {
 			await setupProductCheckout(
-				config.get( 'addresses.customer.billing' )
+				config.get( 'addresses.upe-customer.billing.be' )
 			);
+			page.waitFor( 1000 );
 			await selectOnCheckout( 'bancontact', page );
 			await shopper.placeOrder();
 			await completeRedirectedPayment( page, 'success' );