diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index b31e4b54ca4..f2120c28402 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -38,17 +38,16 @@
 
 		<div class="dialog-row">
 			<NcButton v-if="showInstallButton && !installingApps"
-				type="tertiary"
-				role="link"
+				data-cy-setup-recommended-apps-skip
 				:href="defaultPageUrl"
-				data-cy-setup-recommended-apps-skip>
+				variant="tertiary">
 				{{ t('core', 'Skip') }}
 			</NcButton>
 
 			<NcButton v-if="showInstallButton"
-				type="primary"
+				data-cy-setup-recommended-apps-install
 				:disabled="installingApps || !isAnyAppSelected"
-				data-cy-setup-recommended-apps-install>
+				variant="primary"
 				@click.stop.prevent="installApps">
 				{{ installingApps ? t('core', 'Installing apps …') : t('core', 'Install recommended apps') }}
 			</NcButton>
diff --git a/cypress/e2e/core/setup.ts b/cypress/e2e/core/setup.ts
index 498e908585c..a94fdde2b25 100644
--- a/cypress/e2e/core/setup.ts
+++ b/cypress/e2e/core/setup.ts
@@ -124,8 +124,19 @@ function sharedSetup() {
 	cy.location('pathname', { timeout: 10000 })
 		.should('include', '/core/apps/recommended')
 
+	// See the apps setup
+	cy.get('[data-cy-setup-recommended-apps]')
+		.should('be.visible')
+		.within(() => {
+			cy.findByRole('heading', { name: 'Recommended apps' })
+				.should('be.visible')
+			cy.findByRole('link', { name: 'Skip' })
+				.should('be.visible')
+			cy.findByRole('button', { name: 'Install recommended apps' })
+				.should('be.visible')
+		})
+
 	// Skip the setup apps
-	cy.get('[data-cy-setup-recommended-apps]').should('be.visible')
 	cy.get('[data-cy-setup-recommended-apps-skip]').click()
 
 	// Go to files