diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run
index 06bf5ad9fa..a8fd2be946 100644
--- a/repos/gems/run/depot_autopilot.run
+++ b/repos/gems/run/depot_autopilot.run
@@ -757,14 +757,14 @@ proc non_executable_supported { } {
 # Whether to skip a test - if undefined for a test, the test is not skipped
 #
 set skip_test(test-fault_detection) [expr [have_spec pistachio] || [have_spec fiasco]]
-set skip_test(test-fs_packet)       [expr [get_cmd_switch --autopilot] && [have_include "power_on/qemu"]]
+set skip_test(test-fs_packet)       [expr ![interactive] && [expr [have_include "power_on/qemu"] || [have_spec rpi]]]
 set skip_test(test-libc)            [expr [have_spec sel4] || [have_spec rpi] || [expr [have_spec pbxa9] && [have_spec foc]] || [expr [have_spec imx53] && [have_spec trustzone]]]
 set skip_test(test-lx_block)        [expr ![have_spec linux]]
 set skip_test(test-python)          [expr ![have_spec x86]]
 set skip_test(test-rm_fault)        [expr [have_spec linux] || ![non_executable_supported]]
 set skip_test(test-rm_fault_no_nox) [expr [have_spec linux] || ![skip_test test-rm_fault]]
 set skip_test(test-rm_nested)       [expr [have_spec linux]]
-set skip_test(test-slab)            [expr [get_cmd_switch --autopilot] && [have_include "power_on/qemu"]]
+set skip_test(test-slab)            [expr ![interactive] && [have_include "power_on/qemu"]]
 set skip_test(test-solo5)           [expr ![have_spec x86_64]]
 set skip_test(test-spark_exception) [expr [have_spec arm]]
 set skip_test(test-tcp_bulk_lwip)   [expr ![have_spec x86]]
@@ -777,7 +777,7 @@ set skip_test(test-tcp_bulk_lxip)   [expr ![have_spec x86]]
 # subsequent tests crashes the system so it gets rebooted by the run script,
 # the system doesn't come up again. It gets stuck after core initialization.
 #
-set skip_test(test-libc_getenv) [expr [get_cmd_switch --autopilot] && [have_spec foc] && [have_spec x86]]
+set skip_test(test-libc_getenv) [expr ![interactive] && [have_spec foc] && [have_spec x86]]
 
 # remember initial qemu args in case we have to re-boot later
 set initial_qemu_args ""