diff --git a/repos/dde_rump/run/libc_vfs_fs_ext2.run b/repos/dde_rump/run/libc_vfs_fs_ext2.run
index 2a60c39ab1..6d5940557e 100644
--- a/repos/dde_rump/run/libc_vfs_fs_ext2.run
+++ b/repos/dde_rump/run/libc_vfs_fs_ext2.run
@@ -1,6 +1,6 @@
-if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
-	puts "Autopilot mode is not supported on this platform."
-	exit 0
+if {[have_cmd_switch --autopilot]} {
+	assert {![have_board virt_qemu_riscv]} \
+		"Autopilot mode is not supported on this platform."
 }
 
 set mkfs_cmd  [installed_command mke2fs]
diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run
index 042aa91ed8..f923788872 100644
--- a/repos/dde_rump/run/rump_ext2.run
+++ b/repos/dde_rump/run/rump_ext2.run
@@ -1,10 +1,8 @@
-if {[have_spec arm]} {
-   assert_spec arm_v7
-}
+assert {[have_spec arm_v7] || ![have_spec arm]}
 
-if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
-	puts "Autopilot mode is not supported on this platform."
-	exit 0
+if {[have_cmd_switch --autopilot]} {
+	assert {![have_board virt_qemu_riscv]} \
+		"Autopilot mode is not supported on this platform."
 }
 
 build {
diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run
index d10c3837b9..620a63e035 100644
--- a/repos/dde_rump/run/rump_fat.run
+++ b/repos/dde_rump/run/rump_fat.run
@@ -1,4 +1,4 @@
-if {[have_spec arm]} { assert_spec arm_v7 }
+assert {[have_spec arm_v7] || ![have_spec arm]}
 
 build {
 	core lib/ld init timer lib/vfs lib/libc
diff --git a/repos/dde_rump/run/rump_iso.run b/repos/dde_rump/run/rump_iso.run
index dc0056d560..651fdfbef9 100644
--- a/repos/dde_rump/run/rump_iso.run
+++ b/repos/dde_rump/run/rump_iso.run
@@ -1,4 +1,4 @@
-if {[have_spec arm]} { assert_spec arm_v7 }
+assert {[have_spec arm_v7] || ![have_spec arm]}
 
 build {
 	core lib/ld init timer lib/vfs