diff --git a/webrtc/system_wrappers/source/thread_posix.cc b/webrtc/system_wrappers/source/thread_posix.cc
index c2a8b3875..4050c82bd 100644
--- a/webrtc/system_wrappers/source/thread_posix.cc
+++ b/webrtc/system_wrappers/source/thread_posix.cc
@@ -110,7 +110,10 @@ bool ThreadPosix::Start(unsigned int& thread_id) {
   if (result != 0)
     return false;
 
-  CHECK_EQ(kEventSignaled, params.started->Wait(WEBRTC_EVENT_INFINITE));
+  // TODO(tommi): Change the timeout back to WEBRTC_EVENT_INFINITE when we've
+  // figured out where we're seeing tests hang.
+  auto state = params.started->Wait(30 * 1000);
+  CHECK_EQ(kEventSignaled, state);
   DCHECK_NE(thread_id_, 0);
 
   thread_id = thread_id_;