diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_access_control.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_access_control.py
index 23a8bc394e..8eb489ec30 100644
--- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_access_control.py
+++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_access_control.py
@@ -139,6 +139,7 @@ def run(self, context: ExecutionContext):
                 "clean_workspace",
                 "Could not clean up workspace, skipping scenario",
             )
+            self.end_test_case()
 
         self.end_test_scenario()
 
diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/nominal_planning/solo_happy_path.py b/monitoring/uss_qualifier/scenarios/astm/utm/nominal_planning/solo_happy_path.py
index 2e9985c625..eca03de94c 100644
--- a/monitoring/uss_qualifier/scenarios/astm/utm/nominal_planning/solo_happy_path.py
+++ b/monitoring/uss_qualifier/scenarios/astm/utm/nominal_planning/solo_happy_path.py
@@ -6,4 +6,5 @@
 class SoloHappyPath(TestScenario):
     @deprecated(deprecated_in="0.26.0")
     def run(self, context):
-        pass
+        self.begin_test_scenario(context)
+        self.end_test_scenario()
diff --git a/monitoring/uss_qualifier/scenarios/scenario.py b/monitoring/uss_qualifier/scenarios/scenario.py
index f1c2d17629..8dcee12631 100644
--- a/monitoring/uss_qualifier/scenarios/scenario.py
+++ b/monitoring/uss_qualifier/scenarios/scenario.py
@@ -554,6 +554,7 @@ def end_test_scenario(self) -> None:
     def go_to_cleanup(self) -> None:
         self._expect_phase(
             {
+                ScenarioPhase.NotStarted,
                 ScenarioPhase.ReadyForTestCase,
                 ScenarioPhase.ReadyForTestStep,
                 ScenarioPhase.RunningTestStep,
diff --git a/monitoring/uss_qualifier/scenarios/scenario_test/generic_test_scenario_test.py b/monitoring/uss_qualifier/scenarios/scenario_test/generic_test_scenario_test.py
index 214463f511..73d451e4e5 100644
--- a/monitoring/uss_qualifier/scenarios/scenario_test/generic_test_scenario_test.py
+++ b/monitoring/uss_qualifier/scenarios/scenario_test/generic_test_scenario_test.py
@@ -518,7 +518,7 @@ def test_go_to_cleanup():
 
     # This is a list of step to do, in order, and if go_to_cleanup should works
     steps_and_result = [
-        ("nop", False),
+        ("nop", True),
         ("begin_test_scenario", True),
         ("begin_test_case", True),
         ("begin_test_step", True),