diff --git a/ChangeLog b/ChangeLog
index 9b28d71ff3..bfcf9e6bc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Oct 12 21:37:25 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/webrick/test_cgi.rb (TestWEBrickCGI#test_cgi): skip a test
+	  depending on locale on Windows. ENV[] doesn't work properly if
+	  console code page is not equal to file system encoding.
+	  [ruby-core:47910] [Bug #7140]
+
 Fri Oct 12 20:40:29 2012  Tanaka Akira  <akr@fsij.org>
 
 	* process.c (posix_sh_cmds): the command name of colon is ":".
diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb
index d930c265de..72e3be9aab 100644
--- a/test/webrick/test_cgi.rb
+++ b/test/webrick/test_cgi.rb
@@ -37,8 +37,13 @@ class TestWEBrickCGI < Test::Unit::TestCase
       req = Net::HTTP::Get.new("/webrick.cgi/%3F%3F%3F?foo=bar")
       http.request(req){|res| assert_equal("/???", res.body, log.call)}
       req = Net::HTTP::Get.new("/webrick.cgi/%A4%DB%A4%B2/%A4%DB%A4%B2")
-      http.request(req){|res|
-        assert_equal("/\xA4\xDB\xA4\xB2/\xA4\xDB\xA4\xB2", res.body, log.call)}
+      # Path info of res.body is passed via ENV.
+      # ENV[] returns different value on Windows depending on locale.
+      unless RUBY_PLATFORM =~ /mswin32|mingw|cygwin|bccwin32/ &&
+             Encoding.find("locale") != Encoding.find("filesystem")
+        http.request(req){|res|
+          assert_equal("/\xA4\xDB\xA4\xB2/\xA4\xDB\xA4\xB2", res.body, log.call)}
+      end
       req = Net::HTTP::Get.new("/webrick.cgi?a=1;a=2;b=x")
       http.request(req){|res| assert_equal("a=1, a=2, b=x", res.body, log.call)}
       req = Net::HTTP::Get.new("/webrick.cgi?a=1&a=2&b=x")