diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
index 436676368447..52327bd91768 100644
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -1230,7 +1230,7 @@ main(int argc, CHAR16 *argv[])
 	 * gets us printf early, but also primes the pump for all future console
 	 * changes to take effect, regardless of where they come from.
 	 */
-	setenv("console", "efi", 1);
+	setenv("console", "comconsole", 1);	/* XXX: force comconsole */
 	uhowto = parse_uefi_con_out();
 #if defined(__riscv)
 	/*
diff --git a/stand/userboot/Makefile b/stand/userboot/Makefile
index f783c93eedea..97d40930f8f2 100644
--- a/stand/userboot/Makefile
+++ b/stand/userboot/Makefile
@@ -1,6 +1,6 @@
 .include <bsd.init.mk>
 
-SUBDIR.yes=		test
+#SUBDIR.yes=		test
 SUBDIR.${MK_FORTH}+= userboot_4th
 SUBDIR.${MK_LOADER_LUA}+= userboot_lua