diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
new file mode 100644
index 00000000000..05a4a7bf33d
--- /dev/null
+++ b/.github/workflows/lint-and-test.yml
@@ -0,0 +1,25 @@
+name: Linting & e2e tests
+
+on: push
+
+jobs:
+  lint-and-test:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      # Install npm dependencies, cache them correctly
+      - name: Cypress run
+        uses: cypress-io/github-action@v6
+        with:
+          # just perform install
+          runTests: false
+      - name: Lint with ESLint
+        run: yarn lint --quiet  # only raise errors
+      - name: Run e2e tests
+        uses: cypress-io/github-action@v6
+        with:
+          # we have already installed all dependencies above
+          install: false
+          # run server in the background
+          start: yarn dev
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index 7e842dbf7ff..00000000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: End-to-end tests
-
-on: push
-
-jobs:
-  cypress-run:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      # Install npm dependencies, cache them correctly
-      # and run all Cypress tests
-      - name: Cypress run
-        uses: cypress-io/github-action@v6
-        with:
-            start: yarn dev