diff --git a/repos/os/run/ping.run b/repos/os/run/ping.run
index 57bade3d18..6960021972 100644
--- a/repos/os/run/ping.run
+++ b/repos/os/run/ping.run
@@ -197,4 +197,9 @@ append_qemu_nic_args
 set done_string ".*\"ping_1\" exited with exit value 0.*\n"
 append_if $second_ping_via_udp done_string ".*ping_2\] From [dst_ip] Destination Unreachable.*\n"
 
-run_genode_until $done_string 30
+proc test_timeout { } {
+	if {[have_spec sel4] && [have_board pc]} { return 60 }
+	return 30
+}
+
+run_genode_until $done_string [test_timeout]
diff --git a/repos/os/run/ping_nic_router.run b/repos/os/run/ping_nic_router.run
index 897935cf4e..28d421d552 100644
--- a/repos/os/run/ping_nic_router.run
+++ b/repos/os/run/ping_nic_router.run
@@ -239,4 +239,10 @@ append done_string ".*ping_22\] From 10.0.4.1 icmp_seq=.* Destination Unreachabl
 
 append_if $on_hardware done_string ".*ping_23\] From [good_dst_ip] Destination Unreachable.*\n"
 
-run_genode_until $done_string 30
+proc test_timeout { } {
+	if {[have_spec sel4] && [have_board pc]} { return 60 }
+	if {[have_spec pistachio] && [have_board pc]} { return 60 }
+	return 30
+}
+
+run_genode_until $done_string [test_timeout]