diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 1312ab6..b1e6c11 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -15,17 +15,5 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 jobs:
   tests:
-    name: "Tests"
-    strategy:
-      fail-fast: false
-      matrix:
-        group:
-          - Core
-          - Datafit
-        version:
-          - '1'
-    uses: "SciML/.github/.github/workflows/tests.yml@v1"
-    with:
-      julia-version: "${{ matrix.version }}"
-      group: "${{ matrix.group }}"
+    uses: "SciML/.github/.github/workflows/grouped-tests.yml@v1"
     secrets: "inherit"
diff --git a/Project.toml b/Project.toml
index 1744564..d643861 100644
--- a/Project.toml
+++ b/Project.toml
@@ -35,6 +35,7 @@ Reexport = "1"
 SafeTestsets = "0.1"
 SciMLBase = "2.54, 3.1"
 SciMLExpectations = "2"
+SciMLTesting = "1"
 Test = "1"
 Turing = "0.33, 0.34, 0.35, 0.36, 0.45"
 julia = "1.10"
@@ -42,7 +43,8 @@ julia = "1.10"
 [extras]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Aqua", "SafeTestsets", "Test"]
+test = ["Aqua", "SafeTestsets", "SciMLTesting", "Test"]
diff --git a/test/datafit.jl b/test/Datafit/datafit.jl
similarity index 100%
rename from test/datafit.jl
rename to test/Datafit/datafit.jl
diff --git a/test/qa/Project.toml b/test/qa/Project.toml
new file mode 100644
index 0000000..03e281b
--- /dev/null
+++ b/test/qa/Project.toml
@@ -0,0 +1,15 @@
+[deps]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
+EasyModelAnalysis = "ef4b24a4-a090-4686-a932-e7e56a5a83bd"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[sources]
+EasyModelAnalysis = {path = "../.."}
+
+[compat]
+Aqua = "0.8"
+SafeTestsets = "1, 0.1"
+SciMLTesting = "1"
+julia = "1.10"
diff --git a/test/qa.jl b/test/qa/qa.jl
similarity index 100%
rename from test/qa.jl
rename to test/qa/qa.jl
diff --git a/test/runtests.jl b/test/runtests.jl
index 503c4f5..80ba099 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,20 +1,3 @@
-using SafeTestsets, Test
+using SciMLTesting
 
-const GROUP = get(ENV, "GROUP", "All")
-
-@time begin
-    if GROUP == "All" || GROUP == "Core"
-        @testset "Core" begin
-            @time @safetestset "Quality Assurance" include("qa.jl")
-            @time @safetestset "Basic Tests" include("basics.jl")
-            @time @safetestset "Sensitivity Tests" include("sensitivity.jl")
-            @time @safetestset "Ensemble Tests" include("ensemble.jl")
-            @time @safetestset "Threshold Tests" include("threshold.jl")
-            @time @safetestset "Example Tests" include("examples.jl")
-        end
-    end
-
-    if GROUP == "All" || GROUP == "Datafit"
-        @time @safetestset "Datafit Tests" include("datafit.jl")
-    end
-end
+run_tests()
diff --git a/test/test_groups.toml b/test/test_groups.toml
new file mode 100644
index 0000000..7d44ab8
--- /dev/null
+++ b/test/test_groups.toml
@@ -0,0 +1,8 @@
+[Core]
+versions = ["1"]
+
+[Datafit]
+versions = ["1"]
+
+[QA]
+versions = ["lts", "1"]