diff --git a/code/unit_tests/map_tests.dm b/code/unit_tests/map_tests.dm
index 017d0678876..178c3768f96 100644
--- a/code/unit_tests/map_tests.dm
+++ b/code/unit_tests/map_tests.dm
@@ -159,6 +159,8 @@
 	var/checks = 0
 	var/failed_checks = 0
 	for(var/obj/structure/machinery/door/airlock/A in world)
+		if(QDELETED(A))
+			continue
 		var/turf/T = get_turf(A)
 		checks++
 		TEST_ASSERT_NOTNULL(T, "A turf does not exist under the door at [A.x],[A.y],[A.z]")
@@ -180,8 +182,11 @@
 	var/checks = 0
 	var/failed_checks = 0
 	for(var/obj/structure/machinery/door/firedoor/F in world)
+		if(QDELETED(F))
+			continue
 		var/turf/T = get_turf(F)
 		checks++
+		TEST_ASSERT_NOTNULL(T, "A turf does not exist under the firedoor at [F.x],[F.y],[F.z]")
 		var/firelock_increment = 0
 		for(var/obj/structure/machinery/door/firedoor/FD in T)
 			firelock_increment += 1
diff --git a/html/changelogs/llywelwyn-maptest-deleted-doors.yml b/html/changelogs/llywelwyn-maptest-deleted-doors.yml
new file mode 100644
index 00000000000..7d15800d332
--- /dev/null
+++ b/html/changelogs/llywelwyn-maptest-deleted-doors.yml
@@ -0,0 +1,4 @@
+author: Llywelwyn
+delete-after: True
+changes:
+  - code_imp: "Door tests skip qdeleted doors, so they should no longer intermittently fail when landing zone generation clears a ruin."