diff --git a/features.in/stage2/stage1/scripts.d/03-test-kernel b/features.in/stage2/stage1/scripts.d/03-test-kernel
index 9b21fbbb..d7d088d7 100755
--- a/features.in/stage2/stage1/scripts.d/03-test-kernel
+++ b/features.in/stage2/stage1/scripts.d/03-test-kernel
@@ -24,8 +24,10 @@ configured()
 ls $CONFIGS >&/dev/null || fatal "no stage1 kernel config found in /boot"
 
 # test for installer-required filesystems support
-for opt in SQUASHFS AUFS_FS OVERLAY_FS $GLOBAL_STAGE1_KCONFIG; do
-	[ "$opt" = AUFS_FS ] && [ $(configured "OVERLAY_FS=[my]") -a $(configured "AUFS_FS=n") ] && continue
+configured "OVERLAY_FS=[my]" || configured "AUFS_FS=[my]" ||
+	echo fatal "stage1 kernel must support overlayfs or aufs"
+
+for opt in SQUASHFS $GLOBAL_STAGE1_KCONFIG; do
 	configured "$opt=[my]" || fatal "stage1 kernel must have $opt support"
 done