diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb
index 68c2c28d5a..5b96223da8 100644
--- a/test/webrick/test_filehandler.rb
+++ b/test/webrick/test_filehandler.rb
@@ -266,8 +266,9 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase
         assert_equal("/test", res.body, log.call)
       end
 
+      resok = windows?
       response_assertion = Proc.new do |res|
-        if windows?
+        if resok
           assert_equal("200", res.code, log.call)
           assert_equal("/test", res.body, log.call)
         else
@@ -278,6 +279,7 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase
       http.request(req, &response_assertion)
       req = Net::HTTP::Get.new("/webrick.cgi./test")
       http.request(req, &response_assertion)
+      resok &&= File.exist?(__FILE__+"::$DATA")
       req = Net::HTTP::Get.new("/webrick.cgi::$DATA/test")
       http.request(req, &response_assertion)
     end