1 files changed, 7 insertions, 0 deletions
diff --git a/test/webrick/utils.rb b/test/webrick/utils.rb
index 15852ca47d..10bd7a995b 100644
--- a/test/webrick/utils.rb
+++ b/test/webrick/utils.rb
@@ -13,6 +13,13 @@ module TestWEBrick
     return self
   end
 
+  class WEBrick::HTTPServlet::CGIHandler
+    remove_const :Ruby
+    Ruby = EnvUtil.rubybin
+    remove_const :CGIRunner
+    CGIRunner = "\"#{Ruby}\" \"#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb\"" # :nodoc:
+  end
+
   RubyBin = "\"#{EnvUtil.rubybin}\""
   RubyBin << " --disable-gems"
   RubyBin << " \"-I#{File.expand_path("../..", File.dirname(__FILE__))}/lib\""