diff --git a/.github/workflows/ci-oss.yml b/.github/workflows/ci-oss.yml
index 724cc3ec6..7ccd00bf7 100644
--- a/.github/workflows/ci-oss.yml
+++ b/.github/workflows/ci-oss.yml
@@ -2,6 +2,7 @@ name: CI (OSS)
 
 on:
   pull_request:
+  if: github.event.pull_request.head.repo.full_name != github.repository
 
 jobs:
   test:
diff --git a/.github/workflows/ci-saas.yml b/.github/workflows/ci-saas.yml
index 27c33e7cd..f1d8875b4 100644
--- a/.github/workflows/ci-saas.yml
+++ b/.github/workflows/ci-saas.yml
@@ -4,7 +4,13 @@ on:
   push:
 
 jobs:
-  test:
+  test_oss:
+    name: Test (OSS)
+    uses: ./.github/workflows/test.yml
+    with:
+      saas: false
+  test_saas:
+    name: Test (SaaS)
     uses: ./.github/workflows/test.yml
     with:
       saas: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index da6dc4a61..8b5925a13 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,9 +22,6 @@ jobs:
             db_adapter: sqlite
           - mode: MySQL
             db_adapter: mysql
-          - mode: SaaS
-            db_adapter: mysql
-            saas: ${{ inputs.saas }}
 
     services:
       mysql: