diff --git a/test/syscalls/linux/udp_socket.cc b/test/syscalls/linux/udp_socket.cc
index da8dafe53..345301049 100644
--- a/test/syscalls/linux/udp_socket.cc
+++ b/test/syscalls/linux/udp_socket.cc
@@ -53,10 +53,11 @@ namespace testing {
 
 namespace {
 
-size_t IcmpTimeoutMillis() {
-  // Fuchsia's CI infra is susceptible to timing jumps. Set a long timeout
-  // to avoid flakes.
-  return GvisorPlatform() == Platform::kFuchsia ? 100000 : 1000;
+int IcmpTimeoutMillis() {
+  // Fuchsia's CI infra is susceptible to timing jumps. Set a negative timeout
+  // so that poll will block indefinitely, which effectively delegates the
+  // timeout to infra.
+  return GvisorPlatform() == Platform::kFuchsia ? -1 : 1000;
 }
 
 // Fixture for tests parameterized by the address family to use (AF_INET and