diff --git a/.github/workflows/check_correctness.yml b/.github/workflows/check_correctness.yml
index ebeb99824..61cd6f309 100644
--- a/.github/workflows/check_correctness.yml
+++ b/.github/workflows/check_correctness.yml
@@ -53,24 +53,30 @@ jobs:
           eval $(opam env)
           make build
 
-      - name: Test interpreter
-        run: |
-          eval $(opam env)
-          OPTIMIZE=0 make tests
-
-      - name: Test C backend
+  format:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Check formatting
         run: |
-          eval $(opam env)
-          make test_c_backend
+          dune build @fmt
 
-      - name: Test Python backend
-        run: |
-          eval $(opam env)
-          make test_python_backend
+  tests:
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      matrix:
+        test: ["test_c_backend", "test_java_backend", "test_python_backend"]
+        optimize: [1]
+        include:
+          - test: "tests"
+            optimize: 0
 
-      - name: Test Java backend
+    steps:
+      - name: Test backend
+        env:
+          TEST: ${{ matrix.test }}
+          OPTIMIZE: ${{ matrix.optimize }}
         run: |
           eval $(opam env)
-          make test_java_backend
-
-
+          OPTIMIZE=$OPTIMIZE make $TEST