diff --git a/features.in/grub/cfg.in/90memtest_bios.cfg b/features.in/grub/cfg.in/90memtest_bios.cfg
index 576d3485..02e24e4b 100644
--- a/features.in/grub/cfg.in/90memtest_bios.cfg
+++ b/features.in/grub/cfg.in/90memtest_bios.cfg
@@ -1,5 +1,5 @@
 if [ "$grub_platform" = "pc" ]; then
-	menuentry $"Memory Test" --id 'memtest' {
-		linux16 /syslinux/memtest.bin
-	}
+  menuentry $"Memory Test" --id 'memtest' {
+    linux16 /boot/memtest.bin
+  }
 fi
diff --git a/features.in/memtest/stage1/scripts.d/02-memtest b/features.in/memtest/stage1/scripts.d/02-memtest
index f63d97fd..98a4d586 100755
--- a/features.in/memtest/stage1/scripts.d/02-memtest
+++ b/features.in/memtest/stage1/scripts.d/02-memtest
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-mkdir -p "$WORKDIR"/syslinux
+mkdir -p "$WORKDIR"/boot
 MEMTEST="$(find /boot/ -name 'memtest*' -print -quit)"
 # hdt wiki recommends adding .bin
 [ -z "$MEMTEST" ] ||
-	cp -f "$MEMTEST" "$WORKDIR"/syslinux/memtest.bin
+	cp -f "$MEMTEST" "$WORKDIR"/boot/memtest.bin
diff --git a/features.in/syslinux/cfg.in/90memtest.cfg b/features.in/syslinux/cfg.in/90memtest.cfg
index 7c518f45..b33f63c7 100644
--- a/features.in/syslinux/cfg.in/90memtest.cfg
+++ b/features.in/syslinux/cfg.in/90memtest.cfg
@@ -1,4 +1,4 @@
 label memtest
   menu label ^Memory Test
-  linux memtest.bin
+  linux /boot/memtest.bin