diff --git a/code/datums/storage/subtypes/test_tube_rack.dm b/code/datums/storage/subtypes/test_tube_rack.dm
new file mode 100644
index 00000000000..aa000cdbafa
--- /dev/null
+++ b/code/datums/storage/subtypes/test_tube_rack.dm
@@ -0,0 +1,15 @@
+/datum/storage/test_tube_rack
+	max_slots = 8
+	screen_max_columns = 4
+	screen_max_rows = 2
+	allow_quick_gather = TRUE
+	allow_quick_empty = TRUE
+
+/datum/storage/test_tube_rack/New(
+	atom/parent,
+	max_slots,
+	max_specific_storage,
+	max_total_storage,
+)
+	. = ..()
+	set_holdable(/obj/item/reagent_containers/cup/tube)
diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm
index 643a1275b6f..9441d879799 100644
--- a/code/game/objects/items/storage/medkit.dm
+++ b/code/game/objects/items/storage/medkit.dm
@@ -803,17 +803,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/storage/test_tube_rack/Initialize(mapload)
-	. = ..()
-	atom_storage.allow_quick_gather = TRUE
-	atom_storage.max_slots = 8
-	atom_storage.screen_max_columns = 4
-	atom_storage.screen_max_rows = 2
-	atom_storage.set_holdable(/obj/item/reagent_containers/cup/tube)
-
-/obj/item/storage/test_tube_rack/attack_self(mob/user)
-	emptyStorage()
+	storage_type = /datum/storage/test_tube_rack
 
 /obj/item/storage/test_tube_rack/update_icon_state()
 	icon_state = "[base_icon_state][contents.len > 0 ? contents.len : null]"
@@ -822,4 +812,5 @@
 /obj/item/storage/test_tube_rack/full/PopulateContents()
 	for(var/i in 1 to atom_storage.max_slots)
 		new /obj/item/reagent_containers/cup/tube(src)
+	update_appearance(UPDATE_ICON_STATE)
 
diff --git a/tgstation.dme b/tgstation.dme
index bf52bf176d0..9b9bd545f50 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1960,6 +1960,7 @@
 #include "code\datums\storage\subtypes\portable_chem_mixer.dm"
 #include "code\datums\storage\subtypes\rped.dm"
 #include "code\datums\storage\subtypes\surgery_tray.dm"
+#include "code\datums\storage\subtypes\test_tube_rack.dm"
 #include "code\datums\storage\subtypes\trash.dm"
 #include "code\datums\votes\_vote_datum.dm"
 #include "code\datums\votes\custom_vote.dm"