diff --git a/features.in/efi/config.mk b/features.in/efi/config.mk
index cf1699f7..515c0509 100644
--- a/features.in/efi/config.mk
+++ b/features.in/efi/config.mk
@@ -26,6 +26,9 @@ use/efi/signed: use/efi
 use/efi/shell: use/efi
 	@$(call try,EFI_SHELL,efi-shell)
 
+use/efi/memtest86: use/efi/refind
+	@$(call set,EFI_MEMTEST86,efi-memtest86)
+
 use/efi/debug: use/efi
 	@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
 	@$(call set,KFLAVOURS,led-ws)
diff --git a/features.in/memtest/config.mk b/features.in/memtest/config.mk
index 0fa16281..e386bd2c 100644
--- a/features.in/memtest/config.mk
+++ b/features.in/memtest/config.mk
@@ -2,3 +2,5 @@ use/memtest: use/syslinux
 	@$(call add_feature)
 	@$(call add,SYSTEM_PACKAGES,memtest86+)
 	@$(call add,SYSLINUX_CFG,memtest)
+
+# see also use/efi/memtest86