diff --git a/Project.toml b/Project.toml
index 4583f72..74b2b5c 100644
--- a/Project.toml
+++ b/Project.toml
@@ -39,6 +39,7 @@ PenaltyFunctions = "0.3"
 PreallocationTools = "0.4.34, 1.0"
 Random = "1"
 RecursiveArrayTools = "3.50, 4"
+SafeTestsets = "0.1, 1"
 SciMLBase = "2.153, 3"
 SciMLSensitivity = "7.80"
 SteadyStateDiffEq = "2"
@@ -65,6 +66,7 @@ OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1"
 SteadyStateDiffEq = "9672c7b4-1e72-59bd-8a11-6ac3964bc41f"
 StochasticDiffEq = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
@@ -73,4 +75,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [targets]
-test = ["Test", "ExplicitImports", "BlackBoxOptim", "DelayDiffEq", "ForwardDiff", "Logging", "NLopt", "Optim", "Optimization", "OptimizationBBO", "OptimizationNLopt", "OptimizationOptimJL", "OrdinaryDiffEq", "Pkg", "Random", "SciMLSensitivity", "StochasticDiffEq", "SteadyStateDiffEq", "Sundials", "Zygote"]
+test = ["Test", "ExplicitImports", "BlackBoxOptim", "DelayDiffEq", "ForwardDiff", "Logging", "NLopt", "Optim", "Optimization", "OptimizationBBO", "OptimizationNLopt", "OptimizationOptimJL", "OrdinaryDiffEq", "Pkg", "Random", "SafeTestsets", "SciMLSensitivity", "StochasticDiffEq", "SteadyStateDiffEq", "Sundials", "Zygote"]
diff --git a/test/out_of_place_odes.jl b/test/out_of_place_odes.jl
index 6fbafe8..58b1faa 100644
--- a/test/out_of_place_odes.jl
+++ b/test/out_of_place_odes.jl
@@ -1,4 +1,4 @@
-using OrdinaryDiffEq, Test, SciMLSensitivity, Optimization, OptimizationOptimJL
+using OrdinaryDiffEq, Test, DiffEqParamEstim, SciMLSensitivity, Optimization, OptimizationOptimJL
 
 function LotkaVolterraTest_not_inplace(u, a, t)
     b, c, d = 1.0, 3.0, 1.0
diff --git a/test/runtests.jl b/test/runtests.jl
index 2da5008..1beb0da 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,5 +1,6 @@
 using Pkg
 using DiffEqParamEstim, Test
+using SafeTestsets
 
 const GROUP = get(ENV, "GROUP", "All")
 
@@ -9,11 +10,12 @@ if GROUP == "QA"
     Pkg.instantiate()
     include("qa/qa.jl")
 else
-    @time @testset "Explicit Imports" begin
+    @time @safetestset "Explicit Imports" begin
         include("explicit_imports.jl")
     end
 
-    @time @testset "Tests on ODEs" begin
+    @time @safetestset "Tests on ODEs" begin
+        using DiffEqParamEstim
         include("tests_on_odes/test_problems.jl")
         include("tests_on_odes/l2loss_test.jl")
         include("tests_on_odes/optim_test.jl")
@@ -26,25 +28,25 @@ else
         #include("tests_on_odes/genetic_algorithm_test.jl") # Not updated to v0.6
     end
 
-    @time @testset "Multiple Shooting Objective" begin
+    @time @safetestset "Multiple Shooting Objective" begin
         include("multiple_shooting_objective_test.jl")
     end
-    @time @testset "Likelihood Loss" begin
+    @time @safetestset "Likelihood Loss" begin
         include("likelihood.jl")
     end
-    @time @testset "Out-of-place ODE Tests" begin
+    @time @safetestset "Out-of-place ODE Tests" begin
         include("out_of_place_odes.jl")
     end
-    @time @testset "Steady State Tests" begin
+    @time @safetestset "Steady State Tests" begin
         include("steady_state_tests.jl")
     end
-    @time @testset "DAE Tests" begin
+    @time @safetestset "DAE Tests" begin
         include("dae_tests.jl")
     end
-    @time @testset "DDE Tests" begin
+    @time @safetestset "DDE Tests" begin
         include("dde_tests.jl")
     end
-    @time @testset "Test on Monte" begin
+    @time @safetestset "Test on Monte" begin
         include("test_on_monte.jl")
     end
 end