diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 3d46cfb4e..06d9df5c4 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -32,8 +32,9 @@ Cypress.env('baseUrl', url)
 addCommands()
 
 Cypress.Commands.add('createTable', (title) => {
-	cy.contains('.app-menu-entry--label', 'Tables').click()
-	cy.get('button[aria-label="Create new table"]').click()
+	cy.get('[data-cy="navigationCreateTableIcon"]').click({ force: true })
+	cy.wait(1000)
+	cy.get('[data-cy="createTableModal"]').should('be.visible')
 	cy.get('.tile').contains('Custom table').click({ force: true })
 	cy.get('.modal__content input[type="text"]').clear().type(title)
 	cy.contains('button', 'Create table').click()
@@ -92,11 +93,11 @@ Cypress.Commands.add('sortTableColumn', (columnTitle, mode = 'ASC') => {
 })
 
 Cypress.Commands.add('loadTable', (name) => {
-	cy.get('.app-navigation-entry a[title="' + name + '"]').click({ force: true })
+	cy.get('[data-cy="navigationTableItem"] a[title="' + name + '"]').click({ force: true })
 })
 
 Cypress.Commands.add('loadView', (name) => {
-	cy.get('.app-navigation-entry a[title="' + name + '"]').click({ force: true })
+	cy.get('[data-cy="navigationViewItem"] a[title="' + name + '"]').click({ force: true })
 })
 
 Cypress.Commands.add('unifiedSearch', (term) => {
diff --git a/src/modules/navigation/sections/Navigation.vue b/src/modules/navigation/sections/Navigation.vue
index 117d17ed4..ea6fc02cf 100644
--- a/src/modules/navigation/sections/Navigation.vue
+++ b/src/modules/navigation/sections/Navigation.vue
@@ -25,7 +25,7 @@
 				<NcAppNavigationCaption :name="t('tables', 'Tables')">
 					<template #actions>
 						<NcActionButton :aria-label="t('tables', 'Create table')" icon="icon-add"
-							@click.prevent="createTable" />
+							data-cy="navigationCreateTableIcon" @click.prevent="createTable" />
 					</template>
 				</NcAppNavigationCaption>