diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index c7d97f410..11d43519b 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -60,6 +60,12 @@ jobs:
           name: build-json
           path: kompassi-v2-frontend/build.json
 
+  # TODO Placeholder for actual tests, so that we can require step "test" to succeed for automerge (backend actually has one)
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - run: "true"
+
   deploy_staging:
     runs-on: qb-arc-runners
     needs: build
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 4af648c8a..fdbd5fcb5 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -23,23 +23,14 @@ jobs:
       - uses: actions/setup-python@v7
         with:
           python-version-file: ".python-version"
-
-      - run: uv sync --locked
-      - uses: j178/prek-action@v3.0.0
-
-  eslint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-
       - uses: actions/setup-node@v7
         with:
           node-version: 24
           cache: npm
           cache-dependency-path: kompassi-v2-frontend/package-lock.json
 
+      - run: uv sync --locked
       - run: npm ci
         working-directory: kompassi-v2-frontend
 
-      - run: npx eslint src
-        working-directory: kompassi-v2-frontend
+      - uses: j178/prek-action@v3.0.0
diff --git a/kompassi-v2-frontend/.pre-commit-config.yaml b/kompassi-v2-frontend/.pre-commit-config.yaml
index 25edf16a2..abfe68f8c 100644
--- a/kompassi-v2-frontend/.pre-commit-config.yaml
+++ b/kompassi-v2-frontend/.pre-commit-config.yaml
@@ -5,3 +5,10 @@ repos:
     rev: v3.9.6
     hooks:
       - id: prettier
+
+  - repo: https://github.com/pre-commit/mirrors-eslint
+    rev: v9.39.1
+    hooks:
+      - id: eslint
+        files: \.[jt]sx?$
+        types: [file]