diff --git a/usr/bin/archboot-testsuite.sh b/usr/bin/archboot-testsuite.sh
index f39a3fd9b..9706b2696 100755
--- a/usr/bin/archboot-testsuite.sh
+++ b/usr/bin/archboot-testsuite.sh
@@ -95,12 +95,12 @@ dd if=/dev/zero of="${_IMG}" bs=1M count=1000 &>"${_NO_LOG}"
 sync
 losetup -f "${_IMG}"
 for i in bcachefs btrfs ext4 swap vfat xfs; do
-    command -v mkfs.${i} || return 1
     if [[ "${i}" == "swap" ]]; then
         echo -n "${i} "
         mkswap "${_LOOP}" &>"${_NO_LOG}" ||\
         echo "Creation error: ${i}" >> filesystems-error.log
     else
+        command -v mkfs.${i} &>"${_NO_LOG}" || break
         echo -n "${i} "
         mkfs.${i} "${_LOOP}" &>"${_NO_LOG}" ||\
         echo "Creation error: ${i}" >> filesystems-error.log