diff --git a/cypress.config.js b/cypress.config.js
new file mode 100644
index 000000000..9a1051dbe
--- /dev/null
+++ b/cypress.config.js
@@ -0,0 +1,17 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  projectId: '1s7wkc',
+  viewportWidth: 1280,
+  viewportHeight: 720,
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+    baseUrl: 'http://nextcloud.local/index.php',
+    experimentalSessionAndOrigin: true,
+    specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+  },
+})
diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index b6fbba8dd..000000000
--- a/cypress.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "baseUrl": "http://nextcloud.local/index.php",
-  "projectId": "1s7wkc",
-  "viewportWidth": 1280,
-  "viewportHeight": 720,
-  "experimentalSessionAndOrigin": true
-}
diff --git a/cypress/integration/boardFeatures.js b/cypress/e2e/boardFeatures.js
similarity index 100%
rename from cypress/integration/boardFeatures.js
rename to cypress/e2e/boardFeatures.js
diff --git a/cypress/integration/cardFeatures.js b/cypress/e2e/cardFeatures.js
similarity index 100%
rename from cypress/integration/cardFeatures.js
rename to cypress/e2e/cardFeatures.js
diff --git a/cypress/integration/deckDashboard.js b/cypress/e2e/deckDashboard.js
similarity index 100%
rename from cypress/integration/deckDashboard.js
rename to cypress/e2e/deckDashboard.js
diff --git a/cypress/integration/stackFeatures.js b/cypress/e2e/stackFeatures.js
similarity index 100%
rename from cypress/integration/stackFeatures.js
rename to cypress/e2e/stackFeatures.js
diff --git a/cypress/support/index.js b/cypress/support/e2e.js
similarity index 100%
rename from cypress/support/index.js
rename to cypress/support/e2e.js