diff --git a/test/runtests.jl b/test/runtests.jl
index 0ba23fc4f7..4f6c20e04b 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -33,8 +33,6 @@ end
             @safetestset "Dynamic Quantities Test" include("dq_units.jl")
             @safetestset "Unitful Quantities Test" include("units.jl")
             @safetestset "Mass Matrix Test" include("mass_matrix.jl")
-            @safetestset "Guess Propagation" include("guess_propagation.jl")
-            @safetestset "Hierarchical Initialization Equations" include("hierarchical_initialization_eqs.jl")
             @safetestset "Reduction Test" include("reduction.jl")
             @safetestset "Split Parameters Test" include("split_parameters.jl")
             @safetestset "StaticArrays Test" include("static_arrays.jl")
@@ -57,14 +55,16 @@ end
             @safetestset "Constants Test" include("constants.jl")
             @safetestset "Parameter Dependency Test" include("parameter_dependencies.jl")
             @safetestset "Generate Custom Function Test" include("generate_custom_function.jl")
-            @safetestset "Initial Values Test" include("initial_values.jl")
             @safetestset "Equation Type Accessors Test" include("equation_type_accessors.jl")
             @safetestset "Equations with complex values" include("complex.jl")
         end
     end
 
     if GROUP == "All" || GROUP == "InterfaceI" || GROUP == "Initialization"
+            @safetestset "Guess Propagation" include("guess_propagation.jl")
+            @safetestset "Hierarchical Initialization Equations" include("hierarchical_initialization_eqs.jl")
             @safetestset "InitializationSystem Test" include("initializationsystem.jl")
+            @safetestset "Initial Values Test" include("initial_values.jl")
     end
 
     if GROUP == "All" || GROUP == "InterfaceII"