diff --git a/Project.toml b/Project.toml
index 4d17810..e3f84be 100644
--- a/Project.toml
+++ b/Project.toml
@@ -24,10 +24,11 @@ ModelingToolkit = "9, 10, 11"
 NonlinearSolve = "3, 4"
 ODEInterface = "0.5"
 ODEProblemLibrary = "1"
-Pkg = "1"
 Reexport = "1.2.2"
+SafeTestsets = "0.0.1, 0.1"
 SciMLBase = "3.1"
 SciMLLogging = "1.10.1, 2"
+SciMLTesting = "1"
 SymbolicIndexingInterface = "0.3"
 Test = "1"
 julia = "1.10"
@@ -37,9 +38,10 @@ ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
 ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
 ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
 SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["ExplicitImports", "ModelingToolkit", "NonlinearSolve", "SymbolicIndexingInterface", "Test", "ODEProblemLibrary", "Pkg"]
+test = ["ExplicitImports", "ModelingToolkit", "NonlinearSolve", "SafeTestsets", "SciMLTesting", "SymbolicIndexingInterface", "Test", "ODEProblemLibrary"]
diff --git a/test/qa/Project.toml b/test/qa/Project.toml
index 018949b..793a409 100644
--- a/test/qa/Project.toml
+++ b/test/qa/Project.toml
@@ -2,6 +2,8 @@
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
 ODEInterfaceDiffEq = "09606e27-ecf5-54fc-bb29-004bd9f985bf"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [sources]
@@ -10,5 +12,7 @@ ODEInterfaceDiffEq = { path = "../.." }
 [compat]
 Aqua = "0.8"
 JET = "0.9,0.10,0.11"
+SafeTestsets = "0.0.1, 0.1"
+SciMLTesting = "1"
 Test = "1"
 julia = "1.10"
diff --git a/test/runtests.jl b/test/runtests.jl
index 79e5f27..a18a7cc 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,40 +1,2 @@
-using ODEInterfaceDiffEq, DiffEqBase
-using Test
-
-const GROUP = get(ENV, "GROUP", "All")
-
-if GROUP == "All" || GROUP == "Core"
-    @time @testset "Explicit Imports" begin
-        include("explicit_imports.jl")
-    end
-    @time @testset "Algorithms" begin
-        include("algorithm_tests.jl")
-    end
-    @time @testset "Saving" begin
-        include("saving_tests.jl")
-    end
-    @time @testset "Mass Matrix" begin
-        include("mass_matrix_tests.jl")
-    end
-    @time @testset "Jacobian Tests" begin
-        include("jac_tests.jl")
-    end
-    @time @testset "Callback Tests" begin
-        include("callbacks.jl")
-    end
-    @time @testset "Initialization Tests" begin
-        include("initialization_tests.jl")
-    end
-    @time @testset "MTK Initialization Tests" begin
-        include("mtk_initialization_tests.jl")
-    end
-end
-
-if GROUP == "QA"
-    using Pkg
-    Pkg.activate(joinpath(@__DIR__, "qa"))
-    Pkg.instantiate()
-    @time @testset "Quality Assurance" begin
-        include(joinpath("qa", "qa.jl"))
-    end
-end
+using SciMLTesting
+run_tests()