diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index 34164a19f0..e727b27db0 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -135,7 +135,7 @@ module ActionController
 
       @controller.process :blocking_stream
 
-      assert t.join
+      assert t.join(3), 'timeout expired before the thread terminated'
     end
 
     def test_thread_locals_get_copied