diff --git a/repos/dde_linux/run/vfs_cfg.run b/repos/dde_linux/run/vfs_cfg.run
index 778e0c6fe5..55419cc29b 100644
--- a/repos/dde_linux/run/vfs_cfg.run
+++ b/repos/dde_linux/run/vfs_cfg.run
@@ -1,3 +1,8 @@
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 set build_components {
 	core init timer
 	lib/vfs/lxip
diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run
index b503d8223a..aae5b29348 100644
--- a/repos/dde_rump/run/rump_ext2.run
+++ b/repos/dde_rump/run/rump_ext2.run
@@ -2,6 +2,11 @@ if {[have_spec arm]} {
    assert_spec arm_v7
 }
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 #
 # Check used commands
 #
diff --git a/repos/gems/run/aes_cbc_4k.run b/repos/gems/run/aes_cbc_4k.run
index 78e22f428d..b3587084d9 100644
--- a/repos/gems/run/aes_cbc_4k.run
+++ b/repos/gems/run/aes_cbc_4k.run
@@ -3,6 +3,11 @@ set block_number 12345
 
 set test_rounds  10000
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 build "core init test/aes_cbc_4k"
 
 create_boot_directory
diff --git a/repos/gems/run/depot_download.run b/repos/gems/run/depot_download.run
index 4c31f1323d..c7447db9db 100644
--- a/repos/gems/run/depot_download.run
+++ b/repos/gems/run/depot_download.run
@@ -5,6 +5,11 @@ if {[have_board linux] || [have_board rpi3] || [have_board imx53_qsb_tz]} {
 	exit 0
 }
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 import_from_depot [depot_user]/src/[base_src] \
                   [depot_user]/pkg/[drivers_nic_pkg] \
                   [depot_user]/src/report_rom \
diff --git a/repos/gems/run/fs_query.run b/repos/gems/run/fs_query.run
index 3d2f44311d..e0f8336938 100644
--- a/repos/gems/run/fs_query.run
+++ b/repos/gems/run/fs_query.run
@@ -1,5 +1,10 @@
 create_boot_directory
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 import_from_depot \
 	[depot_user]/src/[base_src] \
 	[depot_user]/src/coreutils \
diff --git a/repos/gems/run/vfs_import.run b/repos/gems/run/vfs_import.run
index 9c2697a441..d0d963dd6f 100644
--- a/repos/gems/run/vfs_import.run
+++ b/repos/gems/run/vfs_import.run
@@ -1,3 +1,8 @@
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 build { app/sequence server/vfs lib/vfs/import test/libc }
 
 create_boot_directory
diff --git a/repos/libports/run/extract.run b/repos/libports/run/extract.run
index 4bf7419e10..ebe95751c5 100644
--- a/repos/libports/run/extract.run
+++ b/repos/libports/run/extract.run
@@ -1,5 +1,10 @@
 create_boot_directory
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 import_from_depot [depot_user]/src/[base_src] \
                   [depot_user]/src/init
 
diff --git a/repos/libports/run/fetchurl.inc b/repos/libports/run/fetchurl.inc
index dd6e132830..3a06584d94 100644
--- a/repos/libports/run/fetchurl.inc
+++ b/repos/libports/run/fetchurl.inc
@@ -9,7 +9,8 @@ if {[have_board rpi3] || [have_board imx53_qsb_tz]} {
 	exit 0
 }
 
-if {[get_cmd_switch --autopilot] && [have_board linux]} {
+if {[get_cmd_switch --autopilot] && ([have_board linux] ||
+                                     [have_board riscv_qemu])} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/libports/run/ieee754.run b/repos/libports/run/ieee754.run
index 4ad7431a32..b226fa2c46 100644
--- a/repos/libports/run/ieee754.run
+++ b/repos/libports/run/ieee754.run
@@ -7,6 +7,11 @@ if {[have_board rpi]} {
 	exit 0
 }
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 build "core init test/ieee754"
 create_boot_directory
 
diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc
index ae92fdd7c9..bf1a557ed6 100644
--- a/repos/libports/run/libc_filesystem_test.inc
+++ b/repos/libports/run/libc_filesystem_test.inc
@@ -9,6 +9,11 @@ if {[have_board zynq_qemu]} {
 	exit 0
 }
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 # use SD on Qemu/pbxa9
 set use_sd_card_drv [expr [have_include "power_on/qemu"] && [have_board pbxa9]]
 
diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run
index e158dac50b..c2cdfcaf9b 100644
--- a/repos/libports/run/lwip.run
+++ b/repos/libports/run/lwip.run
@@ -22,10 +22,14 @@
 
 if {[have_board linux] ||
     [have_board imx53_qsb_tz] ||
-    [have_board rpi3]  ||
-    [have_board spike]} {
+    [have_board rpi3]} {
 	puts "\n Run script is not supported on this platform. \n"; exit 0 }
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 set lynx [installed_command lynx]
 
 create_boot_directory
diff --git a/repos/libports/run/moon.run b/repos/libports/run/moon.run
index f01112b5b5..31fc965041 100644
--- a/repos/libports/run/moon.run
+++ b/repos/libports/run/moon.run
@@ -1,3 +1,8 @@
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 #
 # Lua C++ library test
 #
diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run
index e7058378a0..7aac8e2276 100644
--- a/repos/libports/run/nic_bridge.run
+++ b/repos/libports/run/nic_bridge.run
@@ -8,6 +8,11 @@ if {[have_board rpi3]} {
 	exit 0
 }
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 create_boot_directory
 
 import_from_depot [depot_user]/src/[base_src] \
diff --git a/repos/libports/run/nic_router.inc b/repos/libports/run/nic_router.inc
index 2f7b2d455e..bbd3dcb71a 100644
--- a/repos/libports/run/nic_router.inc
+++ b/repos/libports/run/nic_router.inc
@@ -1,4 +1,7 @@
-
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
 source ${genode_dir}/repos/base/run/platform_drv.inc
 
 set targets "core init timer server/nic_router server/nic_bridge
diff --git a/repos/os/run/cpu_bench.run b/repos/os/run/cpu_bench.run
index 86db4cca31..098de816b6 100644
--- a/repos/os/run/cpu_bench.run
+++ b/repos/os/run/cpu_bench.run
@@ -1,11 +1,11 @@
-if { [get_cmd_switch --autopilot] } {
+if {[get_cmd_switch --autopilot]} {
 	if {[have_include "power_on/qemu"]} {
 		puts "\nRun script does not support Qemu.\n"
 		exit 0
 	}
 }
 
-if {[have_board linux] || [have_board spike]} {
+if {[have_board linux]} {
 	puts "\n Run script is not supported on this platform. \n";
 	exit 0
 }
diff --git a/repos/os/run/fb_bench.run b/repos/os/run/fb_bench.run
index 49f333e074..b0a2c24f7a 100644
--- a/repos/os/run/fb_bench.run
+++ b/repos/os/run/fb_bench.run
@@ -8,7 +8,8 @@ if {[have_board imx7d_sabre] ||
 	exit 0
 }
 
-if {[get_cmd_switch --autopilot] && [have_spec linux]} {
+if {[get_cmd_switch --autopilot] && ([have_spec linux] ||
+                                     [have_board riscv_qemu])} {
 	puts "\nAutopilot run is not supported on this platform\n"
 	exit 0
 }
diff --git a/repos/os/run/nic_dump.run b/repos/os/run/nic_dump.run
index 7228ef2ab2..0228d42774 100644
--- a/repos/os/run/nic_dump.run
+++ b/repos/os/run/nic_dump.run
@@ -4,6 +4,11 @@ if {[have_spec foc] || [have_spec linux] || [have_board rpi3] ||
 	exit 0
 }
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 set on_hardware [expr ![have_include power_on/qemu]]
 
 create_boot_directory
diff --git a/repos/os/run/nic_router_disable_arp.run b/repos/os/run/nic_router_disable_arp.run
index 773022d07a..6a60925cdf 100644
--- a/repos/os/run/nic_router_disable_arp.run
+++ b/repos/os/run/nic_router_disable_arp.run
@@ -5,6 +5,11 @@ if {![have_include power_on/qemu] || [have_spec foc] || [have_spec linux] ||
 	exit 0
 }
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 create_boot_directory
 
 import_from_depot [depot_user]/src/[base_src] \
diff --git a/repos/os/run/nic_router_flood.run b/repos/os/run/nic_router_flood.run
index 14b77c6b96..3c502abfc6 100644
--- a/repos/os/run/nic_router_flood.run
+++ b/repos/os/run/nic_router_flood.run
@@ -7,6 +7,11 @@ if {![have_include power_on/qemu] ||
 	exit 0
 }
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 proc test_timeout { } {
 	if {[have_spec sel4] && [have_spec x86]} {
 		return 240
diff --git a/repos/os/run/ping.run b/repos/os/run/ping.run
index 8f64730298..58c57ee607 100644
--- a/repos/os/run/ping.run
+++ b/repos/os/run/ping.run
@@ -37,8 +37,9 @@ if {[have_spec foc] || [have_board rpi3] || [have_board imx53_qsb_tz]} {
 	exit 0
 }
 
-if {[get_cmd_switch --autopilot] && [have_spec linux]} {
-	puts "Run script does not support autopilot on Linux."
+if {[get_cmd_switch --autopilot] && ([have_spec linux] ||
+                                     [have_board riscv_qemu])} {
+	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
 
diff --git a/repos/os/run/ping_nic_router.run b/repos/os/run/ping_nic_router.run
index 14e323ed99..30ba974ad4 100644
--- a/repos/os/run/ping_nic_router.run
+++ b/repos/os/run/ping_nic_router.run
@@ -4,6 +4,11 @@ if {[have_spec foc] || [have_spec linux] || [have_board rpi3] ||
 	exit 0
 }
 
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 set on_hardware [expr ![have_include power_on/qemu]]
 
 create_boot_directory
diff --git a/repos/os/run/sd_card_bench.run b/repos/os/run/sd_card_bench.run
index 48a7c71ac3..dfafa12de4 100644
--- a/repos/os/run/sd_card_bench.run
+++ b/repos/os/run/sd_card_bench.run
@@ -1,6 +1,10 @@
 #
 # Check for platform support
 #
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
 
 proc buffer_size_kib {} {
 	if {[have_board pbxa9]}           { return [expr 12 * 1024] }
diff --git a/repos/ports/run/verify.run b/repos/ports/run/verify.run
index 5733644e68..c93f89ae2b 100644
--- a/repos/ports/run/verify.run
+++ b/repos/ports/run/verify.run
@@ -1,3 +1,8 @@
+if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+	puts "Autopilot mode is not supported on this platform."
+	exit 0
+}
+
 create_boot_directory
 
 import_from_depot [depot_user]/src/[base_src] \