diff --git a/features.in/grub/cfg.in/90memtest_bios.cfg b/features.in/grub/cfg.in/90memtest_bios.cfg
new file mode 100644
index 00000000..576d3485
--- /dev/null
+++ b/features.in/grub/cfg.in/90memtest_bios.cfg
@@ -0,0 +1,5 @@
+if [ "$grub_platform" = "pc" ]; then
+	menuentry $"Memory Test" --id 'memtest' {
+		linux16 /syslinux/memtest.bin
+	}
+fi
diff --git a/features.in/memtest/config.mk b/features.in/memtest/config.mk
index 8e15d23d..2fc60b38 100644
--- a/features.in/memtest/config.mk
+++ b/features.in/memtest/config.mk
@@ -1,8 +1,9 @@
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-use/memtest: use/syslinux
+use/memtest: use/syslinux use/grub
 	@$(call add_feature)
 	@$(call add,SYSTEM_PACKAGES,memtest86+)
 	@$(call add,SYSLINUX_CFG,memtest)
+	@$(call add,GRUB_CFG,memtest_bios)
 else
 use/memtest: ; @:
 endif