diff --git a/repos/libports/run/nic_dump.run b/repos/libports/run/nic_dump.run
index a65dd6940c..48dc364145 100644
--- a/repos/libports/run/nic_dump.run
+++ b/repos/libports/run/nic_dump.run
@@ -138,4 +138,8 @@ lappend boot_modules nic_dump
 
 build_boot_image $boot_modules
 
-run_genode_until {.*Test done.*\n.*Test done.*\n} 120
+for {set i 0} {$i < $nr_of_clients} {incr i 1} {
+	append done_string {.*Test done.*\n}
+}
+
+run_genode_until $done_string 120
diff --git a/repos/libports/run/nic_router.inc b/repos/libports/run/nic_router.inc
index a214dafdbe..54805a848e 100644
--- a/repos/libports/run/nic_router.inc
+++ b/repos/libports/run/nic_router.inc
@@ -72,6 +72,8 @@ proc server_bin { prot } {
 	if {$prot == "http"} { return "test-lwip_httpsrv_static" } }
 
 proc client_config { name prot ip_addr gateway netmask nic srv_port srv_ip } {
+	global nr_of_clients
+	incr nr_of_clients
 	append result {
 		<start name="} $name {" caps="200" priority="-1">
 			<binary  name="} [client_bin $prot] {" />
diff --git a/repos/libports/run/nic_router.run b/repos/libports/run/nic_router.run
index ec88aca2c3..a19196ae67 100644
--- a/repos/libports/run/nic_router.run
+++ b/repos/libports/run/nic_router.run
@@ -9,7 +9,6 @@ proc enable_test_4 { } { return 1 }
 proc enable_test_5 { } { return 1 }
 proc enable_test_6 { } { return 1 }
 proc enable_test_7 { } { return 0 }
-proc nr_of_clients { } { return 7 }
 
 source ${genode_dir}/repos/libports/run/nic_router.inc
 
@@ -265,7 +264,7 @@ install_config $config
 
 build_boot_image $boot_modules
 
-for {set i 0} {$i < [nr_of_clients]} {incr i 1} {
+for {set i 0} {$i < $nr_of_clients} {incr i 1} {
 	append done_string {.*Test done.*\n}
 }