diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
index 39b8d54b5..e08495faf 100644
--- a/src/pages/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -83,7 +83,11 @@ const { openConfirmationModal } = useVnConfirm();
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('department.chat')" :value="entity.chatName" />
-            <VnLv :label="t('department.email')" :value="entity.notificationEmail" copy />
+            <VnLv
+                :label="t('globals.params.email')"
+                :value="entity.notificationEmail"
+                copy
+            />
             <VnLv
                 :label="t('department.selfConsumptionCustomer')"
                 :value="entity.client?.name"
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue
index 623eab94a..f38b4a7ff 100644
--- a/src/pages/Department/Card/DepartmentSummary.vue
+++ b/src/pages/Department/Card/DepartmentSummary.vue
@@ -58,7 +58,7 @@ onMounted(async () => {
                             dash
                         />
                         <VnLv
-                            :label="t('department.email')"
+                            :label="t('globals.params.email')"
                             :value="department.notificationEmail"
                             dash
                         />
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 2fe4fcddc..50831fb65 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -676,6 +676,7 @@ function setReference(data) {
             color="primary"
             fab
             icon="vn:invoice-in"
+            data-cy="ticketListMakeInvoiceBtn"
         />
         <QTooltip>
             {{ t('ticketList.createInvoice') }}
diff --git a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
index 8927f05ff..3db4d89ca 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
@@ -24,21 +24,24 @@ describe('InvoiceOut list', () => {
         cy.dataCy('vnSearchBar').find('input').type('{enter}');
         cy.dataCy('InvoiceOutFilterAmountBtn').find('input').type('8.88{enter}');
     });
+
     it('should download a pdf', () => {
         cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
         cy.dataCy('InvoiceOutDownloadPdfBtn').click();
         cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
     });
+
     it('should give an error when manual invoicing a ticket that is already invoiced', () => {
-        cy.get('[data-cy="vnTableCreateBtn"]').click();
+        cy.dataCy('vnTableCreateBtn').click();
         cy.fillInForm(invoiceError);
-        cy.get('[data-cy="FormModelPopup_save"]').click();
+        cy.dataCy('FormModelPopup_save').click();
         cy.get(notification).should('contains.text', 'This ticket is already invoiced');
     });
+
     it('should create a manual invoice and enter to its summary', () => {
-        cy.get('[data-cy="vnTableCreateBtn"]').click();
+        cy.dataCy('vnTableCreateBtn').click();
         cy.fillInForm(invoice);
-        cy.get('[data-cy="FormModelPopup_save"]').click();
+        cy.dataCy('FormModelPopup_save').click();
         cy.get(notification).should('contains.text', 'Data created');
     });
 });
diff --git a/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
index 12c767950..56f103a8c 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
@@ -10,15 +10,11 @@ describe('InvoiceOut manual invoice', () => {
     });
 
     it('should create an invoice from a ticket and go to that invoice', () => {
-        cy.get(
-            '[label="Customer ID"] > .q-field > .q-field__inner > .q-field__control'
-        ).type('1101{enter}');
+        cy.get('[label="Customer ID"]').type('1101{enter}');
         cy.get(
             '[data-q-vs-anchor=""] > :nth-child(1) > .q-checkbox > .q-checkbox__inner'
         ).click();
-        cy.get(
-            '[style="transform: translate(-256px, 0px); margin: 80px 20px; z-index: 2;"] > div > .q-btn'
-        ).click();
+        cy.dataCy('ticketListMakeInvoiceBtn').click();
         cy.get(notification).should('contains.text', 'Data saved');
         cy.get('.q-virtual-scroll__content > :nth-child(1) > :nth-child(3)').click();
         cy.get(':nth-child(8) > .value > .link').click();
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
index e7874b523..14b50c699 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -17,7 +17,7 @@ describe('InvoiceOut summary', () => {
         cy.get('#searchbar input').type('T1111111{enter}');
         cy.get('[data-cy="descriptor-more-opts"] > .q-btn__content > .q-icon').click();
         cy.get('.q-menu > .q-list > :nth-child(6)').click();
-        cy.get('[data-cy="VnConfirm_confirm"]').click();
+        cy.dartaCy('VnConfirm_confirm').click();
         cy.get(notification).should(
             'contains.text',
             'The invoice PDF document has been regenerated'
@@ -39,7 +39,7 @@ describe('InvoiceOut summary', () => {
         cy.get('#searchbar input').type('T2222222{enter}');
         cy.get('[data-cy="descriptor-more-opts"] > .q-btn__content > .q-icon').click();
         cy.get('.q-menu > .q-list > :nth-child(4)').click();
-        cy.get('[data-cy="VnConfirm_confirm"]').click();
+        cy.dartaCy('VnConfirm_confirm').click();
         cy.get(notification).should('contains.text', 'InvoiceOut deleted');
     });
 
diff --git a/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js b/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js
index 6025929db..0db8ffda3 100644
--- a/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js
+++ b/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js
@@ -8,13 +8,13 @@ describe('InvoiceOut global invoicing', () => {
 
     it('should invoice the client tickets', () => {
         cy.get('.q-mb-sm > .q-radio__inner').click();
-        cy.get('[data-cy="InvoiceOutGlobalClientSelect"]').type('1101');
+        cy.dataCy('InvoiceOutGlobalClientSelect').type('1101');
         cy.get('.q-menu .q-item').contains('1101').click();
-        cy.get('[data-cy="InvoiceOutGlobalSerialSelect"]').click();
+        cy.dataCy('InvoiceOutGlobalSerialSelect').click();
         cy.get('.q-menu .q-item').contains('global').click();
-        cy.get('[data-cy="InvoiceOutGlobalCompanySelect"]').type('VNL');
+        cy.dataCy('InvoiceOutGlobalCompanySelect').type('VNL');
         cy.get('.q-menu .q-item').contains('VNL').click();
-        cy.get('[data-cy="InvoiceOutGlobalPrinterSelect"]').type('printer1');
+        cy.dataCy('InvoiceOutGlobalPrinterSelect').type('printer1');
         cy.get('.q-menu .q-item').contains('printer1').click();
         cy.get(
             '[label="Invoice date"] > .q-field > .q-field__inner > .q-field__control'
@@ -22,9 +22,7 @@ describe('InvoiceOut global invoicing', () => {
         cy.get(':nth-child(5) > div > .q-btn > .q-btn__content > .block').click();
         cy.get('.q-date__years-content > :nth-child(2) > .q-btn').click();
         cy.get('.q-date__calendar-days > :nth-child(6) > .q-btn').click();
-        cy.get(
-            '[label="Max date ticket"] > .q-field > .q-field__inner > .q-field__control'
-        ).type('01-01-2001{enter}');
+        cy.get('[label="Max date ticket"]').type('01-01-2001{enter}');
         cy.get('.q-card').should('be.visible');
     });
 });