diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
index 89578c7c3..54013c44e 100644
--- a/.github/workflows/Tests.yml
+++ b/.github/workflows/Tests.yml
@@ -8,7 +8,7 @@ on:
     paths-ignore:
       - 'docs/**'
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review, converted_to_draft]
+    types: [opened, synchronize, reopened, ready_for_review, converted_to_draft, closed]
   workflow_dispatch:
 
 concurrency:
@@ -22,6 +22,8 @@ jobs:
     with:
       fast: "${{ github.event.pull_request.draft == true }}"
       exclude: '["testsuite"]'
+      extra-os-on-prs: true
+      staged: ${{ github.event_name == 'pull_request' }}
       timeout-minutes: 120
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/test/runtests.jl b/test/runtests.jl
index 8dcfeeba7..f5e839b49 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -25,14 +25,6 @@ if filter_tests!(testsuite, args)
         delete!(testsuite, "common/truncate")
         delete!(testsuite, "decompositions/gen_eig")
         filter!(p -> !startswith(first(p), "chainrules/"), testsuite)
-    else
-        is_apple_ci = Sys.isapple() && get(ENV, "CI", "false") == "true"
-        is_windows_ci = Sys.iswindows() && get(ENV, "CI", "false") == "true"
-        if is_apple_ci
-            filter!(p -> !startswith(first(p), "mooncake/"), testsuite)
-            filter!(p -> !startswith(first(p), "chainrules/"), testsuite)
-        end
-        (is_windows_ci || is_apple_ci) && filter!(p -> !startswith(first(p), "enzyme/"), testsuite)
     end
 end