diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index c51c30b8..83d171d9 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -18,45 +18,7 @@ concurrency:
 
 jobs:
   tests:
-    name: "Tests"
-    strategy:
-      fail-fast: false
-      matrix:
-        version:
-          - "lts"
-          - "1"
-          - "pre"
-        group:
-          - "Core"
-          - "QA"
-          - "SymbolicIndexingInterface"
-          - "Downstream"
-          - "NoPre"
-        exclude:
-          # JET (NoPre) is not run on prereleases.
-          - version: "pre"
-            group: "NoPre"
-          # QA (Aqua) runs only on lts and 1, never on prereleases.
-          - version: "pre"
-            group: "QA"
-    uses: "SciML/.github/.github/workflows/tests.yml@v1"
+    uses: "SciML/.github/.github/workflows/grouped-tests.yml@v1"
     with:
-      julia-version: "${{ matrix.version }}"
-      group: "${{ matrix.group }}"
-      num-threads: "2"
       check-bounds: "auto"
-      coverage-directories: "src,ext"
-    secrets: "inherit"
-
-  # GPU tests are a dep-adding group (test/GPU/Project.toml) that runs on the
-  # self-hosted GPU runner. Folded in from the former bespoke GPU.yml.
-  gpu:
-    name: "GPU Tests"
-    uses: "SciML/.github/.github/workflows/tests.yml@v1"
-    with:
-      julia-version: "1"
-      group: "GPU"
-      runner: '["self-hosted", "Linux", "X64", "gpu"]'
-      timeout-minutes: 60
-      coverage-directories: "src,ext"
     secrets: "inherit"
diff --git a/test/test_groups.toml b/test/test_groups.toml
new file mode 100644
index 00000000..2da0790b
--- /dev/null
+++ b/test/test_groups.toml
@@ -0,0 +1,24 @@
+[Core]
+versions = ["lts", "1", "pre"]
+num_threads = 2
+
+[QA]
+versions = ["lts", "1"]
+num_threads = 2
+
+[SymbolicIndexingInterface]
+versions = ["lts", "1", "pre"]
+num_threads = 2
+
+[Downstream]
+versions = ["lts", "1", "pre"]
+num_threads = 2
+
+[NoPre]
+versions = ["lts", "1"]
+num_threads = 2
+
+[GPU]
+versions = ["1"]
+runner = ["self-hosted", "Linux", "X64", "gpu"]
+timeout = 60