diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 95a996c75..66d2447ad 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -286,7 +286,11 @@ bootcheck-linux16-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(s
 bootcheck-linux16-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-BOOTCHECKS+=bootcheck-linux16-i386 bootcheck-linux16-x86_64
+BOOTCHECKS += bootcheck-linux16-i386 bootcheck-linux16-x86_64
+# It is defined in i386.rmk but requires ACPI
+BOOTCHECKS += bootcheck-kfreebsd-x86_64
+# It is defined in i386.rmk but crashes early on non-BIOS
+BOOTCHECKS += bootcheck-knetbsd-i386
 
 include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 9007b2889..97becfc7b 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -157,8 +157,7 @@ bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64 \
-	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
-	bootcheck-knetbsd-i386 bootcheck-knetbsd-x86_64
+	bootcheck-kfreebsd-i386 bootcheck-knetbsd-x86_64
 
 .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
 	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \