diff --git a/repos/os/run/tz_vmm.run b/repos/os/run/tz_vmm.run
index af10dcaa1..64f213d97 100644
--- a/repos/os/run/tz_vmm.run
+++ b/repos/os/run/tz_vmm.run
@@ -58,14 +58,12 @@ build_boot_image "core init tz_vmm linux initrd.gz"
 # Execute test case
 #
 run_genode_until {.*\/ #.*} 220
+set serial_id [output_spawn_id]
 
 # Wait for network to settle down
-send "sleep 5\n"
-send "wget http://genode.org/\n"
+send -i $serial_id "sleep 5\n"
+send -i $serial_id "wget http://genode.org/\n"
 
-expect {
-	 -re "Connecting to genode.org.*index.html.*\/ #.*" { }
-	timeout { puts stderr "Error: Test execution timed out"; exit -2 }
-}
+run_genode_until "Connecting to genode.org.*index.html.*\/ #.*" 30 $serial_id
 
 exec rm bin/initrd.gz bin/initrd.gz.md5 bin/linux bin/linux.md5
diff --git a/repos/ports-foc/run/l4linux.run b/repos/ports-foc/run/l4linux.run
index d02ce22a2..d94af2795 100644
--- a/repos/ports-foc/run/l4linux.run
+++ b/repos/ports-foc/run/l4linux.run
@@ -185,14 +185,12 @@ append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 -net user "
 # Execute test case
 #
 run_genode_until {.*\/ #.*} 220
+set serial_id [output_spawn_id]
 
 # Wait for network to settle down
-send "sleep 5\n"
-send "wget http://genode.org/\n"
+send -i $serial_id "sleep 5\n"
+send -i $serial_id "wget http://genode.org/\n"
 
-expect {
-	 -re "Connecting to genode.org.*index.html.*\/ #.*" { }
-	timeout { puts stderr "Error: Test execution timed out"; exit -2 }
-}
+run_genode_until "Connecting to genode.org.*index.html.*\/ #.*" 30 $serial_id
 
 exec rm bin/initrd.gz bin/initrd.gz.md5