diff --git a/code/unit_tests/map_tests.dm b/code/unit_tests/map_tests.dm
index de67e760c3f..92d17a2aba4 100644
--- a/code/unit_tests/map_tests.dm
+++ b/code/unit_tests/map_tests.dm
@@ -12,8 +12,6 @@
 					/area/holodeck,
 					/area/supply/station,
 					/area/mine,
-					/area/tether/surfacebase/outside, // VOREStation Edit - Outside,
-					/area/vacant, // VOREStation Edit - All vacant areas!,
 					/area/vacant/vacant_shop,
 					/area/turbolift,
 					/area/submap					)
@@ -26,11 +24,6 @@
 						/area/server,
 						/area/mine,
 						/area/vacant/vacant_shop,
-						/area/engineering/atmos/intake, // VOREStation Edit - Outside,
-						/area/rnd/external, // VOREStation Edit - Outside,
-						/area/tether/surfacebase/mining_main/external, // VOREStation Edit - Outside,
-						/area/tether/surfacebase/mining_main/airlock, // VOREStation Edit - Its an airlock,
-						/area/tether/surfacebase/emergency_storage, // VOREStation Edit,
 						/area/rnd/research_storage, // This should probably be fixed,
 						/area/security/riot_control // This should probably be fixed,
 						)
diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm
index 7592f71f657..cc340e38e06 100644
--- a/maps/tether/tether_defines.dm
+++ b/maps/tether/tether_defines.dm
@@ -105,6 +105,16 @@
 
 	allowed_spawns = list("Tram Station","Gateway","Cryogenic Storage","Cyborg Storage")
 
+	unit_test_exempt_areas = list(
+		/area/tether/surfacebase/outside/outside1,
+		/area/vacant/vacant_site)
+	unit_test_exempt_from_atmos = list(
+		/area/engineering/atmos/intake, // Outside,
+		/area/rnd/external, //  Outside,
+		/area/tether/surfacebase/mining_main/external, // Outside,
+		/area/tether/surfacebase/mining_main/airlock, //  Its an airlock,
+		/area/tether/surfacebase/emergency_storage/rnd,
+		/area/tether/surfacebase/emergency_storage/atrium)
 
 /datum/map/tether/perform_map_generation()