diff --git a/cypress/e2e/templates.spec.js b/cypress/e2e/templates.spec.js
index 5d237b5926..eecc4346b8 100644
--- a/cypress/e2e/templates.spec.js
+++ b/cypress/e2e/templates.spec.js
@@ -18,7 +18,7 @@ describe('Create new office files from templates', function() {
 	it('Create a new file from a user template', function() {
 		cy.visit('/apps/files')
 
-		cy.get('.files-list__header div[menu-title="New"] button')
+		cy.get('[data-cy-upload-picker=""]')
 			.should('be.visible')
 			.as('newFileMenu')
 
@@ -41,7 +41,7 @@ describe('Create new office files from templates', function() {
 		cy.login(randUser)
 		cy.visit('/apps/files')
 
-		cy.get('.files-list__header div[menu-title="New"] button')
+		cy.get('[data-cy-upload-picker=""]')
 			.should('be.visible')
 			.as('newFileMenu')
 
@@ -70,7 +70,7 @@ describe('Create new office files from templates', function() {
 				},
 			})
 
-			cy.get('.files-controls .button.new')
+			cy.get('[data-cy-upload-picker=""]')
 				.should('be.visible')
 				.click()
 
@@ -110,7 +110,7 @@ describe('Create templates with fields', () => {
 			cy.visit('/apps/files')
 
 			// Create a templates folder
-			cy.get('.files-list__header div[menu-title="New"] button')
+			cy.get('[data-cy-upload-picker=""]')
 				.should('be.visible')
 				.as('newFileMenu')
 
@@ -134,7 +134,7 @@ describe('Create templates with fields', () => {
 		cy.visit('/apps/files')
 
 		// Create a new document
-		cy.get('.files-list__header div[menu-title="New"] button')
+		cy.get('[data-cy-upload-picker=""]')
 			.should('be.visible')
 			.as('newFileMenu')