diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9e6b401b..b4aa7640 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,18 +1,25 @@
 name: Test
 
-on: [push]
+on:
+  push:
+  pull_request:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v7
-    - uses: astral-sh/setup-uv@v10.0.1
-    - name: Install dependencies
-      run: uv sync
-    - name: Lint
-      run: make lint
-    - name: Typecheck
-      run: make typecheck
-    - name: Test with pytest
-      run: make coverage
+      - uses: actions/checkout@v7
+      - name: Install uv
+        uses: astral-sh/setup-uv@v10.0.1
+        with:
+          enable-cache: true
+      - name: Install dependencies
+        run: uv sync
+      - name: Lint with ruff
+        run: uv run ruff check ddmc
+      - name: Check formatting with ruff
+        run: uv run ruff format --check ddmc
+      - name: Type check with ty
+        run: uv run ty check ddmc
+      - name: Test with pytest
+        run: uv run pytest --cov=ddmc --cov-report=term