diff --git a/iso/builder/config/bootloaders/grub-pc/grub.cfg b/iso/builder/config/bootloaders/grub-pc/grub.cfg
index 9ad6f88..557ff09 100644
--- a/iso/builder/config/bootloaders/grub-pc/grub.cfg
+++ b/iso/builder/config/bootloaders/grub-pc/grub.cfg
@@ -29,9 +29,15 @@ menuentry "EASY-BEE (fail-safe)" {
     initrd  @INITRD_LIVE@
 }
 
-menuentry "Memory Test (memtest86+)" {
-    linux16 /boot/memtest86+.bin
-}
+if [ "${grub_platform}" = "efi" ]; then
+    menuentry "Memory Test (memtest86+)" {
+        chainloader /boot/memtest86+x64.efi
+    }
+else
+    menuentry "Memory Test (memtest86+)" {
+        linux16 /boot/memtest86+x64.bin
+    }
+fi
 
 if [ "${grub_platform}" = "efi" ]; then
     menuentry "UEFI Firmware Settings" {