diff --git a/worlds/witness/test/test_disable_non_randomized.py b/worlds/witness/test/test_disable_non_randomized.py
index 0ae6a81b9e87..6cf6aeae0fef 100644
--- a/worlds/witness/test/test_disable_non_randomized.py
+++ b/worlds/witness/test/test_disable_non_randomized.py
@@ -12,24 +12,25 @@ class TestDisableNonRandomized(WitnessTestBase):
     def test_unrandomized_locations_do_not_exist(self) -> None:
         self.assert_location_does_not_exist("Orchard Apple Tree 5")
 
-    def test_can_reach_lasers_through_alternate_activation_triggers(self) -> None:
+    def test_locations_got_disabled_and_alternate_activation_triggers_work(self) -> None:
         """
         Test that specific Discarded Panels give extra lasers.
         """
-        self.assertFalse(_has_lasers(1, self.world, False)(self.multiworld.state))
 
-        self.collect_by_name("Triangles")
+        with self.subTest("Test that unrandomized locations are disabled."):
+            self.assert_location_does_not_exist("Orchard Apple Tree 5")
 
-        # Alternate activation triggers yield Bunker Laser (Mountainside Discard) and Monastery Laser (Desert Discard)
-        self.assertTrue(_has_lasers(2, self.world, False)(self.multiworld.state))
-        self.assertFalse(_has_lasers(3, self.world, False)(self.multiworld.state))
+        with self.subTest("Test that alternate activation trigger events exist."):
+            self.assert_dependency_on_event_item(
+                self.world.get_entrance("Town Tower After Third Door to Town Tower Top"),
+                "Town Tower 4th Door Opens",
+            )
 
-    def test_town_tower_fourth_door_depends_on_event(self) -> None:
-        """
-        Test that entities with alternate activation triggers depend on their specific event items.
-        Specifically, assert that Town Tower Fourth Door requires the Town Tower 4th Door Opens event item.
-        """
-        self.assert_dependency_on_event_item(
-            self.world.get_entrance("Town Tower After Third Door to Town Tower Top"),
-            "Town Tower 4th Door Opens",
-        )
+        with self.subTest("Test that alternate activation triggers award lasers."):
+            self.assertFalse(_has_lasers(1, self.world, False)(self.multiworld.state))
+
+            self.collect_by_name("Triangles")
+
+            # Alternate activation triggers yield Bunker Laser (Mountainside Discard) and Monastery Laser (Desert Discard)
+            self.assertTrue(_has_lasers(2, self.world, False)(self.multiworld.state))
+            self.assertFalse(_has_lasers(3, self.world, False)(self.multiworld.state))