diff --git a/data/efi/memtest64.efi b/data/efi/memtest64.efi
new file mode 100644
index 0000000..516dd0f
Binary files /dev/null and b/data/efi/memtest64.efi differ
diff --git a/data/grub/grub.cfg b/data/grub/grub.cfg
index f09420e..8141bb7 100644
--- a/data/grub/grub.cfg
+++ b/data/grub/grub.cfg
@@ -41,3 +41,7 @@ menuentry "Try or Install DISTRO_NAME" --class DISTRO_CODE {
 	linux /CASPER_PATH/vmlinuz.efi boot=casper live-media-path=/CASPER_PATH hostname=DISTRO_CODE username=DISTRO_CODE noprompt DISTRO_PARAMS ---
 	initrd /CASPER_PATH/initrd.gz
 }
+
+menuentry "Memtest86+" {
+ 	linux /efi/boot/memtest64.efi keyboard=both
+}
diff --git a/data/isolinux/isolinux.cfg b/data/isolinux/isolinux.cfg
index ed86066..85a66df 100644
--- a/data/isolinux/isolinux.cfg
+++ b/data/isolinux/isolinux.cfg
@@ -3,3 +3,6 @@ default DISTRO_CODE
 label DISTRO_CODE
     kernel /CASPER_PATH/vmlinuz.efi
     append initrd=/CASPER_PATH/initrd.gz boot=casper live-media-path=/CASPER_PATH hostname=DISTRO_CODE username=DISTRO_CODE noprompt DISTRO_PARAMS ---
+
+label MEMTEST
+    kernel /efi/boot/memtest64.efi
diff --git a/mk/iso.mk b/mk/iso.mk
index eeca84c..e019f51 100644
--- a/mk/iso.mk
+++ b/mk/iso.mk
@@ -101,6 +101,7 @@ $(BUILD)/grub:
 
 	rm -rf "$(BUILD)/iso/efi"
 	mkdir -p "$(BUILD)/iso/efi/boot/"
+	cp -r "data/efi/memtest64.efi" "$(BUILD)/iso/efi/boot/memtest64.efi"
 	cp -r "data/efi/shimx64.efi.signed" "$(BUILD)/iso/efi/boot/bootx64.efi"
 	cp -r "/usr/lib/grub/x86_64-efi-signed/gcdx64.efi.signed" "$(BUILD)/iso/efi/boot/grubx64.efi"