diff --git a/tests/Cypress/cypress/support/actions/storefront/checkout/CheckoutAction.js b/tests/Cypress/cypress/support/actions/storefront/checkout/CheckoutAction.js
index 6e0df1291..8b4d66b42 100644
--- a/tests/Cypress/cypress/support/actions/storefront/checkout/CheckoutAction.js
+++ b/tests/Cypress/cypress/support/actions/storefront/checkout/CheckoutAction.js
@@ -112,11 +112,11 @@ export default class CheckoutAction {
 
     changeBillingCountry(billingCountry){
 
-        cy.get('.confirm-shipping-address a[data-address-editor]').click();
+        cy.get('.js-confirm-overview-addresses .card:eq(0) .card-actions a[data-address-editor]').click();
         cy.wait(2000);
         cy.get('.address-editor-edit').click();
         cy.wait(1000);
-        cy.get('select#shipping-addressAddressCountry.country-select').eq(0).select(billingCountry);
-        cy.get('.address-form-actions button').eq(0).click();
+        cy.get('select.country-select:eq(0)').select(billingCountry);
+        cy.get('.address-form-actions:eq(0) button').click();
     }
 }