diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 3bcd2581a..53b225f7a 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -22,7 +22,11 @@ jobs:
       fail-fast: false
       matrix:
         group:
-          - All
+          - Core
+          - NLLS
+          - 23TestProblems
+          - Wrappers
+          - Miscellaneous
         version:
           - '1'
           - '~1.10.0-0'
diff --git a/test/runtests.jl b/test/runtests.jl
index 855a793fc..2e74e905c 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -13,13 +13,14 @@ end
 
 @time begin
     if GROUP == "All" || GROUP == "Core"
-        @time @safetestset "Quality Assurance" include("qa.jl")
         @time @safetestset "Basic Tests + Some AD" include("basictests.jl")
-        @time @safetestset "Sparsity Tests" include("sparse.jl")
-        @time @safetestset "Polyalgs" include("polyalgs.jl")
-        @time @safetestset "Matrix Resizing" include("matrix_resizing.jl")
-        @time @safetestset "Infeasible Problems" include("infeasible.jl")
+    end
+
+    if GROUP == "All" || GROUP == "NLLS"
         @time @safetestset "Nonlinear Least Squares" include("nonlinear_least_squares.jl")
+    end
+
+    if GROUP == "All" || GROUP == "Wrappers"
         @time @safetestset "MINPACK" include("minpack.jl")
         @time @safetestset "NLsolve" include("nlsolve.jl")
     end
@@ -28,6 +29,14 @@ end
         @time @safetestset "23 Test Problems" include("23_test_problems.jl")
     end
 
+    if GROUP == "All" || GROUP == "Miscellaneous"
+        @time @safetestset "Quality Assurance" include("qa.jl")
+        @time @safetestset "Sparsity Tests" include("sparse.jl")
+        @time @safetestset "Polyalgs" include("polyalgs.jl")
+        @time @safetestset "Matrix Resizing" include("matrix_resizing.jl")
+        @time @safetestset "Infeasible Problems" include("infeasible.jl")
+    end
+
     if GROUP == "GPU"
         activate_downstream_env()
         @time @safetestset "GPU Tests" include("gpu.jl")