diff --git a/repos/ports/run/debug_nitpicker.run b/repos/ports/run/debug_nitpicker.run
index d2adfa308..f7d4bcfaf 100644
--- a/repos/ports/run/debug_nitpicker.run
+++ b/repos/ports/run/debug_nitpicker.run
@@ -12,7 +12,10 @@
 # 'tcp_terminal' could be used (to attach GDB via a network connection).
 #
 
-assert_spec x86
+if {![have_include "power_on/qemu"] ||
+    !([have_spec nova])} {
+	 puts "Run script is only supported for NOVA in Qemu"; exit 0
+}
 
 create_boot_directory
 import_from_depot [depot_user]/src/[base_src] \
diff --git a/repos/ports/run/gdb_monitor_interactive.run b/repos/ports/run/gdb_monitor_interactive.run
index 998c0209b..0b8e0a10f 100644
--- a/repos/ports/run/gdb_monitor_interactive.run
+++ b/repos/ports/run/gdb_monitor_interactive.run
@@ -5,7 +5,10 @@
 # \date   2011-05-24
 #
 
-assert_spec x86
+if {![have_include "power_on/qemu"] ||
+    !([have_spec nova])} {
+	 puts "Run script is only supported for NOVA in Qemu"; exit 0
+}
 
 #
 # Build
diff --git a/repos/ports/run/gdb_monitor_target_config.run b/repos/ports/run/gdb_monitor_target_config.run
index 2a4de0326..ca87ba219 100644
--- a/repos/ports/run/gdb_monitor_target_config.run
+++ b/repos/ports/run/gdb_monitor_target_config.run
@@ -4,7 +4,11 @@
 # \date   2012-04-16
 #
 
-assert_spec x86
+if {![have_include "power_on/qemu"] ||
+    !([have_spec nova])} {
+	 puts "Run script is only supported for NOVA in Qemu"; exit 0
+}
+
 #
 # Build
 #