diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run
index 0cbf972be..5fa8e2c51 100644
--- a/repos/libports/run/nic_bridge.run
+++ b/repos/libports/run/nic_bridge.run
@@ -2,6 +2,11 @@
 # Build
 #
 
+if {![have_include power_on/qemu]} {
+	puts "Run script is only supported on Qemu"
+	exit 0
+}
+
 set build_components {
 	core init
 	drivers/timer drivers/nic
@@ -122,4 +127,4 @@ append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 "
 
 append qemu_args " -net user "
 
-run_genode_until forever
+run_genode_until ".*\"test-http_clnt\" exited with exit value 0.*\n" 30
diff --git a/tool/autopilot.list b/tool/autopilot.list
index 2fd6a9b03..5736aa0a5 100644
--- a/tool/autopilot.list
+++ b/tool/autopilot.list
@@ -92,6 +92,7 @@ smartcard
 new_delete
 timeout
 nic_router
+nic_bridge
 init_smp
 sd_card_bench
 ram_fs_chunk