diff --git a/.github/workflows/lint-docs.yml b/.github/workflows/check-doc.yml
similarity index 56%
rename from .github/workflows/lint-docs.yml
rename to .github/workflows/check-doc.yml
index 12ec03fe..06dcf376 100644
--- a/.github/workflows/lint-docs.yml
+++ b/.github/workflows/check-doc.yml
@@ -1,4 +1,4 @@
-name: Lint & Docs
+name: Check doc
 
 on:
   push:
@@ -7,22 +7,6 @@ on:
     branches: [ 'master', 'stable-*' ]
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.11"
-        cache: 'pip'
-        cache-dependency-path: '**/pyproject.toml'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install tox
-    - name: Run Lint
-      run: tox -e lint
 
   test_doc:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/lint-and-tests.yml
similarity index 87%
rename from .github/workflows/unit-tests.yml
rename to .github/workflows/lint-and-tests.yml
index 57d007a3..23f71fdc 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/lint-and-tests.yml
@@ -1,4 +1,4 @@
-name: Unit tests
+name: Lint & unit tests
 
 on:
   push:
@@ -7,10 +7,27 @@ on:
     branches: [ 'master', 'stable-*' ]
 
 jobs:
-  test:
-
+  lint:
     runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.11"
+        cache: 'pip'
+        cache-dependency-path: '**/pyproject.toml'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install tox
+    - name: Run Lint
+      run: tox -e lint
 
+  test:
+    # Dependency on linting to avoid running our expensive matrix test for nothing
+    needs: lint
+    runs-on: ubuntu-latest
     # Use postgresql and MariaDB versions of Debian bookworm
     services:
       postgres: