2 files changed, 13 insertions, 2 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index cd9ad3c858..cf7f6e9887 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -1,11 +1,18 @@
 module EnvUtil
   def rubybin
+    unless ENV["RUBYOPT"]
+      
+    end
     if ruby = ENV["RUBY"]
       return ruby
     end
     ruby = "ruby"
+    rubyexe = ruby+".exe"
     3.times do
-      if File.exist? ruby or File.exist? ruby+".exe"
+      if File.exist? ruby and File.executable? ruby and !File.directory? ruby
+        return File.expand_path(ruby)
+      end
+      if File.exist? rubyexe and File.executable? rubyexe
         return File.expand_path(ruby)
       end
       ruby = File.join("..", ruby)
diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb
index 703fde4d9a..64b2fcf231 100644
--- a/test/webrick/test_filehandler.rb
+++ b/test/webrick/test_filehandler.rb
@@ -9,7 +9,11 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase
   end
 
   def get_res_body(res)
-    return res.body.read rescue res.body
+    if defined? res.body.read
+      res.body.read
+    else
+      res.body
+    end
   end
 
   def make_range_request(range_spec)