diff --git a/.github/workflows/tests.yaml b/.github/workflows/router_tests.yaml
similarity index 77%
rename from .github/workflows/tests.yaml
rename to .github/workflows/router_tests.yaml
index 412aad6e7..1fbad8c36 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/router_tests.yaml
@@ -1,10 +1,9 @@
-name: Server Tests
+name: Router Tests
 
 on:
   pull_request:
     paths:
-      - ".github/workflows/tests.yaml"
-      - "server/**"
+      - ".github/workflows/router_tests.yaml"
       - "proto/**"
       - "router/**"
       - "launcher/**"
@@ -27,10 +26,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.9
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
@@ -61,19 +56,9 @@ jobs:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-      - name: Filter test dependencies
-        run: |
-          # remove stanford-stk from test requirements as it cannot install correctly without GPUs
-          sed -i '/stanford-stk/d' server/requirements.txt
-          sed -i '/stanford-stk/d' server/pyproject.toml
       - name: Install
         run: |
-          make install
-      - name: Run server tests
-        run: |
-          pip install pytest
-          export HUGGING_FACE_HUB_TOKEN=${{ secrets.HUGGING_FACE_HUB_TOKEN }}
-          pytest -s -vv server/tests
+          make install-router install-launcher
       - name: Run Rust fmt
         run: |
           cargo fmt --check
diff --git a/.github/workflows/server_tests.yaml b/.github/workflows/server_tests.yaml
new file mode 100644
index 000000000..b71ff6470
--- /dev/null
+++ b/.github/workflows/server_tests.yaml
@@ -0,0 +1,38 @@
+name: Server Tests
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/server_tests.yaml"
+      - "server/**"
+      - "proto/**"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  run_tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.9
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+      - name: Filter test dependencies
+        run: |
+          # remove stanford-stk from test requirements as it cannot install correctly without GPUs
+          sed -i '/stanford-stk/d' server/requirements.txt
+          sed -i '/stanford-stk/d' server/pyproject.toml
+      - name: Install
+        run: |
+          make install-server install-custom-kernels
+      - name: Run server tests
+        run: |
+          pip install pytest
+          export HUGGING_FACE_HUB_TOKEN=${{ secrets.HUGGING_FACE_HUB_TOKEN }}
+          pytest -s -vv server/tests