diff --git a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
index 8adbcea8e6..465b37619f 100644
--- a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
+++ b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
@@ -522,7 +522,9 @@ When('you change the sharing settings', () => {
     cy.contains('Select a level').click();
     cy.get('[data-test="dhis2-uicore-popper"]').contains('View and edit').click({ force: true });
     cy.get('[data-test="dhis2-uicore-button"]').contains('Give access').click({ force: true });
-    cy.get('[data-test="dhis2-uicore-button"]').contains('Close').click({ force: true });
+    cy.get('[data-test="sharing-dialog"]').within(() => {
+        cy.get('[data-test="dhis2-uicore-button"]').contains('Close').click({ force: true });
+    });
 });
 
 Then('you see the new sharing settings', () => {
@@ -559,9 +561,10 @@ When('you create a copy of the working list',
         cy.intercept('POST', '**/trackedEntityInstanceFilters**')
             .as('newTrackerFilter');
 
-        cy.get('[data-test="column-selector-dialog"]')
+        cy.get('[data-test="new-template-dialog"]')
             .within(() => {
                 cy.get('[data-test="dhis2-uicore-button"]')
+                    .contains('Save')
                     .click();
             });
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/NewTemplateDialog.component.js b/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/NewTemplateDialog.component.js
index be40bd8671..fcdf355e1b 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/NewTemplateDialog.component.js
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/NewTemplateDialog.component.js
@@ -20,6 +20,7 @@ export const NewTemplateDialog = (props: Props) => {
         <Modal
             hide={!open}
             onClose={onClose}
+            dataTest={'new-template-dialog'}
             position={'center'}
         >
             <NewTemplateContents