diff --git a/lib/cgi.rb b/lib/cgi.rb
index bb306d2e0644cf..0c403bd19c5682 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -3,5 +3,7 @@
 require "cgi/escape"
 warn <<-WARNING, uplevel: Gem::BUNDLED_GEMS.uplevel if $VERBOSE
 CGI library is removed from Ruby 4.0. Please use cgi/escape instead for CGI.escape and CGI.unescape features.
-If you need to use the full features of CGI library, Please install cgi gem.
+
+If you need to use the full features of CGI library, please add 'gem "cgi"' to your script
+or use Bundler to ensure you are using the cgi gem instead of this file.
 WARNING
diff --git a/test/ruby/test_thread_queue.rb b/test/ruby/test_thread_queue.rb
index 9a41be8b1ac1a3..4046185fd21ebf 100644
--- a/test/ruby/test_thread_queue.rb
+++ b/test/ruby/test_thread_queue.rb
@@ -217,7 +217,7 @@ def test_thr_kill
 
     bug5343 = '[ruby-core:39634]'
     Dir.mktmpdir {|d|
-      timeout = 60
+      timeout = 120
       total_count = 250
       begin
         assert_normal_exit(<<-"_eom", bug5343, timeout: timeout, chdir: d)