diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index e5c84ecb7..fb968e2d7 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -56,9 +56,9 @@ export default {
         cityInput: `${components.vnTextfield}[name="city"]`,
         postcodeInput: `${components.vnTextfield}[name="postcode"]`,
         provinceInput: `${components.vnAutocomplete}[field="$ctrl.client.provinceFk"] > vn-vertical > ${components.vnTextfield}`,
-        provinceFifthOption: `${components.vnAutocomplete}[field="$ctrl.client.provinceFk"] > vn-vertical > vn-drop-down > vn-vertical > vn-one:nth-child(1) > ul > li:nth-child(5)`,
+        provinceFifthOption: `${components.vnAutocomplete}[field="$ctrl.client.provinceFk"] > vn-vertical > vn-drop-down > vn-vertical > vn-one:nth-child(2) > ul > li:nth-child(5)`,
         countryInput: `${components.vnAutocomplete}[field="$ctrl.client.countryFk"] > vn-vertical > ${components.vnTextfield}`,
-        countryThirdOption: `${components.vnAutocomplete}[field="$ctrl.client.countryFk"] > vn-vertical > vn-drop-down > vn-vertical > vn-one:nth-child(2) > ul > li:nth-child(3)`,
-        saveButton: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-fiscal-data > form > vn-button-bar > vn-submit > input'
+        countryThirdOption: `${components.vnAutocomplete}[field="$ctrl.client.countryFk"] > vn-vertical > vn-drop-down > vn-vertical > vn-one:nth-child(3) > ul > li:nth-child(3)`,
+        saveButton: `${components.vnSubmit}`
     }
 };
diff --git a/e2e/paths/edit_basic_data.spec.js b/e2e/paths/edit_basic_data.spec.js
index eb46f18dd..8fcd7dca1 100644
--- a/e2e/paths/edit_basic_data.spec.js
+++ b/e2e/paths/edit_basic_data.spec.js
@@ -316,7 +316,7 @@ describe('Edit basicData path', () => {
         .click(selectors.fiscalData.fiscalDataButton)
         .wait(selectors.fiscalData.addressInput)
         .click(selectors.basicData.basicDataButton)
-        .wait(100)
+        .wait(selectors.basicData.basicDataButton)
         .getInputValue(selectors.basicData.channelInput)
         .then(result => {
             expect(result).toEqual('Metropolis newspaper');
diff --git a/e2e/paths/edit_fiscal_data.spec.js b/e2e/paths/edit_fiscal_data.spec.js
index d9561f975..b7cefa28c 100644
--- a/e2e/paths/edit_fiscal_data.spec.js
+++ b/e2e/paths/edit_fiscal_data.spec.js
@@ -5,7 +5,7 @@ import {catchErrors} from '../../services/utils/jasmineHelpers';
 const nightmare = createNightmare();
 const moduleAccessViewHashURL = '#!/';
 
-fdescribe('Edit fiscalData path', () => {
+describe('Edit fiscalData path', () => {
     describe('warm up', () => {
         it('should warm up login and fixtures', done => {
             nightmare
@@ -240,10 +240,9 @@ fdescribe('Edit fiscalData path', () => {
     it(`should confirm the province have been selected`, done => {
         nightmare
         .waitForSnackbarReset()
-        .waitToClick(selectors.basicData.basicDataButton)
+        .click(selectors.basicData.basicDataButton)
         .wait(selectors.basicData.nameInput)
-        .waitToClick(selectors.fiscalData.fiscalDataButton)
-        .wait(selectors.fiscalData.addressInput)
+        .click(selectors.fiscalData.fiscalDataButton)
         .wait(100)
         .getInputValue(selectors.fiscalData.provinceInput)
         .then(result => {