diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
index 6598488122..93db3ac518 100644
--- a/.github/workflows/Tests.yml
+++ b/.github/workflows/Tests.yml
@@ -28,6 +28,8 @@ jobs:
         group:
           - InterfaceI
           - InterfaceII
+          - SymbolicIndexingInterface
+          - Extended
           - Extensions
           - Downstream
           - RegressionI
diff --git a/test/runtests.jl b/test/runtests.jl
index 183113e82c..e45e2dfe42 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -32,22 +32,14 @@ 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 "SteadyStateSystem Test" include("steadystatesystems.jl")
-            @safetestset "SDESystem Test" include("sdesystem.jl")
-            @safetestset "DDESystem Test" include("dde.jl")
-            @safetestset "NonlinearSystem Test" include("nonlinearsystem.jl")
             @safetestset "InitializationSystem Test" include("initializationsystem.jl")
             @safetestset "Guess Propagation" include("guess_propagation.jl")
             @safetestset "Hierarchical Initialization Equations" include("hierarchical_initialization_eqs.jl")
-            @safetestset "PDE Construction Test" include("pde.jl")
-            @safetestset "JumpSystem Test" include("jumpsystem.jl")
-            @safetestset "Constraints Test" include("constraints.jl")
             @safetestset "Reduction Test" include("reduction.jl")
             @safetestset "Split Parameters Test" include("split_parameters.jl")
             @safetestset "StaticArrays Test" include("static_arrays.jl")
             @safetestset "Components Test" include("components.jl")
             @safetestset "Model Parsing Test" include("model_parsing.jl")
-            @safetestset "print_tree" include("print_tree.jl")
             @safetestset "Error Handling" include("error_handling.jl")
             @safetestset "StructuralTransformations" include("structural_transformation/runtests.jl")
             @safetestset "State Selection Test" include("state_selection.jl")
@@ -55,34 +47,47 @@ end
             @safetestset "Stream Connect Test" include("stream_connectors.jl")
             @safetestset "Domain Connect Test" include("domain_connectors.jl")
             @safetestset "Lowering Integration Test" include("lowering_solving.jl")
-            @safetestset "Test Big System Usage" include("bigsystem.jl")
             @safetestset "Dependency Graph Test" include("dep_graphs.jl")
             @safetestset "Function Registration Test" include("function_registration.jl")
             @safetestset "Precompiled Modules Test" include("precompile_test.jl")
-            @safetestset "Variable Utils Test" include("variable_utils.jl")
-            @safetestset "Variable Metadata Test" include("test_variable_metadata.jl")
             @safetestset "DAE Jacobians Test" include("dae_jacobian.jl")
             @safetestset "Jacobian Sparsity" include("jacobiansparsity.jl")
             @safetestset "Modelingtoolkitize Test" include("modelingtoolkitize.jl")
-            @safetestset "OptimizationSystem Test" include("optimizationsystem.jl")
             @safetestset "FuncAffect Test" include("funcaffect.jl")
             @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 "Discrete System" include("discrete_system.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 == "SymbolicIndexingInterface"
+    if GROUP == "All" || GROUP == "InterfaceII"
+        @testset "InterfaceII" begin
+            @safetestset "Variable Utils Test" include("variable_utils.jl")
+            @safetestset "Variable Metadata Test" include("test_variable_metadata.jl")
+            @safetestset "OptimizationSystem Test" include("optimizationsystem.jl")
+            @safetestset "Discrete System" include("discrete_system.jl")
+            @safetestset "SteadyStateSystem Test" include("steadystatesystems.jl")
+            @safetestset "SDESystem Test" include("sdesystem.jl")
+            @safetestset "DDESystem Test" include("dde.jl")
+            @safetestset "NonlinearSystem Test" include("nonlinearsystem.jl")
+            @safetestset "PDE Construction Test" include("pde.jl")
+            @safetestset "JumpSystem Test" include("jumpsystem.jl")
+            @safetestset "print_tree" include("print_tree.jl")
+            @safetestset "Constraints Test" include("constraints.jl")
+        end
+    end
+
+    if GROUP == "All" || GROUP == "SymbolicIndexingInterface"
         @safetestset "SymbolicIndexingInterface test" include("symbolic_indexing_interface.jl")
         @safetestset "SciML Problem Input Test" include("sciml_problem_inputs.jl")
         @safetestset "MTKParameters Test" include("mtkparameters.jl")
     end
 
-    if GROUP == "All" || GROUP == "InterfaceII"
+    if GROUP == "All" || GROUP == "Extended"
+        @safetestset "Test Big System Usage" include("bigsystem.jl")
         println("C compilation test requires gcc available in the path!")
         @safetestset "C Compilation Test" include("ccompile.jl")
         @testset "Distributed Test" include("distributed.jl")