diff --git a/packages/editor/cypress.config.ts b/packages/editor/cypress.config.ts
new file mode 100644
index 00000000..3a66321e
--- /dev/null
+++ b/packages/editor/cypress.config.ts
@@ -0,0 +1,15 @@
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  video: false,
+  videoUploadOnPasses: false,
+  includeShadowDom: true,
+  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://localhost:8081',
+  },
+});
diff --git a/packages/editor/cypress.json b/packages/editor/cypress.json
deleted file mode 100644
index 48846f2a..00000000
--- a/packages/editor/cypress.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "video": false,
-    "videoUploadOnPasses": false,
-    "baseUrl": "http://localhost:8081",
-    "includeShadowDom": true
-  }
-  
\ No newline at end of file
diff --git a/packages/editor/cypress/integration/playground.test.js b/packages/editor/cypress/e2e/playground.cy.js
similarity index 100%
rename from packages/editor/cypress/integration/playground.test.js
rename to packages/editor/cypress/e2e/playground.cy.js
diff --git a/packages/editor/cypress/integration/relationship.test.js b/packages/editor/cypress/e2e/relationship.cy.js
similarity index 100%
rename from packages/editor/cypress/integration/relationship.test.js
rename to packages/editor/cypress/e2e/relationship.cy.js
diff --git a/packages/editor/cypress/integration/topicFontChange.test.js b/packages/editor/cypress/e2e/topicFontChange.cy.js
similarity index 100%
rename from packages/editor/cypress/integration/topicFontChange.test.js
rename to packages/editor/cypress/e2e/topicFontChange.cy.js
diff --git a/packages/editor/cypress/integration/topicManager.test.js b/packages/editor/cypress/e2e/topicManager.cy.js
similarity index 100%
rename from packages/editor/cypress/integration/topicManager.test.js
rename to packages/editor/cypress/e2e/topicManager.cy.js
diff --git a/packages/editor/cypress/integration/topicPosition.test.js b/packages/editor/cypress/e2e/topicPosition.cy.js
similarity index 100%
rename from packages/editor/cypress/integration/topicPosition.test.js
rename to packages/editor/cypress/e2e/topicPosition.cy.js
diff --git a/packages/editor/cypress/integration/topicShape.test.js b/packages/editor/cypress/e2e/topicShape.cy.js
similarity index 100%
rename from packages/editor/cypress/integration/topicShape.test.js
rename to packages/editor/cypress/e2e/topicShape.cy.js
diff --git a/packages/editor/cypress/support/index.js b/packages/editor/cypress/support/e2e.js
similarity index 100%
rename from packages/editor/cypress/support/index.js
rename to packages/editor/cypress/support/e2e.js
diff --git a/packages/mindplot/cypress.config.js b/packages/mindplot/cypress.config.js
new file mode 100644
index 00000000..c987b627
--- /dev/null
+++ b/packages/mindplot/cypress.config.js
@@ -0,0 +1,16 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  video: false,
+  videoUploadOnPasses: false,
+  projectId: 'it9g7s',
+  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://localhost:8083',
+    specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+  },
+})
diff --git a/packages/mindplot/cypress.json b/packages/mindplot/cypress.json
deleted file mode 100644
index 2c06215f..00000000
--- a/packages/mindplot/cypress.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "video": false,
-  "videoUploadOnPasses": false,
-  "baseUrl": "http://localhost:8083",
-  "projectId": "it9g7s"
-}
diff --git a/packages/mindplot/cypress/integration/playground.test.js b/packages/mindplot/cypress/e2e/playground.test.js
similarity index 100%
rename from packages/mindplot/cypress/integration/playground.test.js
rename to packages/mindplot/cypress/e2e/playground.test.js
diff --git a/packages/mindplot/cypress/support/index.js b/packages/mindplot/cypress/support/e2e.js
similarity index 100%
rename from packages/mindplot/cypress/support/index.js
rename to packages/mindplot/cypress/support/e2e.js
diff --git a/packages/web2d/cypress.config.js b/packages/web2d/cypress.config.js
new file mode 100644
index 00000000..46f82450
--- /dev/null
+++ b/packages/web2d/cypress.config.js
@@ -0,0 +1,14 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  video: false,
+  videoUploadOnPasses: false,
+  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://localhost:8080',
+  },
+})
diff --git a/packages/web2d/cypress.json b/packages/web2d/cypress.json
deleted file mode 100644
index 4b86a907..00000000
--- a/packages/web2d/cypress.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "video": false,
-    "videoUploadOnPasses": false,
-    "baseUrl": "http://localhost:8080"
-}
\ No newline at end of file
diff --git a/packages/web2d/cypress/integration/playground.test.js b/packages/web2d/cypress/e2e/playground.cy.js
similarity index 100%
rename from packages/web2d/cypress/integration/playground.test.js
rename to packages/web2d/cypress/e2e/playground.cy.js
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Arrow.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Arrow.snap.png
new file mode 100644
index 00000000..41b4df16
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Arrow.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Curved Line.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Curved Line.snap.png
new file mode 100644
index 00000000..8fe6a017
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Curved Line.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Events.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Events.snap.png
new file mode 100644
index 00000000..4e083b6f
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Events.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Font.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Font.snap.png
new file mode 100644
index 00000000..c5fe6c76
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Font.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Group.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Group.snap.png
new file mode 100644
index 00000000..12c62553
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Group.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Line.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Line.snap.png
new file mode 100644
index 00000000..b571f4f6
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Line.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Poly Line.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Poly Line.snap.png
new file mode 100644
index 00000000..b94366b0
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Poly Line.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Prototype.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Prototype.snap.png
new file mode 100644
index 00000000..dd8c28ea
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Prototype.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Rect.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Rect.snap.png
new file mode 100644
index 00000000..d76d437d
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Rect.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Shapes.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Shapes.snap.png
new file mode 100644
index 00000000..8bd69953
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Shapes.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Text.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Text.snap.png
new file mode 100644
index 00000000..2b2d946d
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Text.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Workspace.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Workspace.snap.png
new file mode 100644
index 00000000..f086d573
Binary files /dev/null and b/packages/web2d/cypress/snapshots/playground.cy.js/Workspace.snap.png differ
diff --git a/packages/web2d/cypress/support/index.js b/packages/web2d/cypress/support/e2e.js
similarity index 100%
rename from packages/web2d/cypress/support/index.js
rename to packages/web2d/cypress/support/e2e.js
diff --git a/packages/webapp/cypress.config.ts b/packages/webapp/cypress.config.ts
new file mode 100644
index 00000000..ccdbb3eb
--- /dev/null
+++ b/packages/webapp/cypress.config.ts
@@ -0,0 +1,14 @@
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  video: false,
+  videoUploadOnPasses: false,
+  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.ts')(on, config);
+    },
+    baseUrl: 'http://localhost:3000',
+  },
+});
diff --git a/packages/webapp/cypress.json b/packages/webapp/cypress.json
deleted file mode 100644
index b8e170f0..00000000
--- a/packages/webapp/cypress.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "video": false,
-    "videoUploadOnPasses": false,
-    "baseUrl": "http://localhost:3000"
-}
diff --git a/packages/webapp/cypress/integration/maps.test.ts b/packages/webapp/cypress/e2e/maps.cy.ts
similarity index 100%
rename from packages/webapp/cypress/integration/maps.test.ts
rename to packages/webapp/cypress/e2e/maps.cy.ts
diff --git a/packages/webapp/cypress/support/index.ts b/packages/webapp/cypress/support/e2e.ts
similarity index 100%
rename from packages/webapp/cypress/support/index.ts
rename to packages/webapp/cypress/support/e2e.ts