diff --git a/code/unit_tests/equipment_tests.dm b/code/unit_tests/equipment_tests.dm
index 25146ab9251..11d1fc54555 100644
--- a/code/unit_tests/equipment_tests.dm
+++ b/code/unit_tests/equipment_tests.dm
@@ -7,17 +7,9 @@
 	async = 1
 
 /datum/unit_test/vision_glasses/start_test()
+	var/mob/living/human/subject = new(get_safe_turf(), SPECIES_HUMAN) // force human so default map species doesn't mess with anything
 	var/list/test = create_test_mob_with_mind(get_safe_turf(), /mob/living/human)
-	if(isnull(test))
-		fail("Check Runtimed in Mob creation")
-
-	if(test["result"] == FAILURE)
-		fail(test["msg"])
-		async = 0
-		return 0
-
-	H = locate(test["mobref"])
-	H.equip_to_slot(new glasses_type(H), slot_glasses_str)
+	subject.equip_to_slot(new glasses_type(subject), slot_glasses_str)
 	return 1
 
 /datum/unit_test/vision_glasses/check_result()
diff --git a/code/unit_tests/mob_tests.dm b/code/unit_tests/mob_tests.dm
index cb0c1ffd480..3ebfdcd6357 100644
--- a/code/unit_tests/mob_tests.dm
+++ b/code/unit_tests/mob_tests.dm
@@ -58,9 +58,7 @@
 
 // ============================================================================
 
-var/global/default_mobloc = null
-
-/proc/create_test_mob_with_mind(var/turf/mobloc, var/mobtype = /mob/living/human)
+/datum/unit_test/mob_damage/proc/create_test_mob_with_mind(var/turf/mobloc, var/mobtype = /mob/living/human)
 	var/list/test_result = list("result" = FAILURE, "msg"    = "", "mobref" = null)
 
 	if(!mobloc)