diff --git a/ChangeLog b/ChangeLog
index 8ae014266f..98464f83eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 14 01:28:17 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_m17n.rb (TestM17N#test_env): the encoding of
+	  ENV is now locale encoding.
+
 Tue Jul 14 01:24:56 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* marshal.c (r_object0): should return real object.
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb
index eb9aa7c93c..cbab1f6692 100644
--- a/test/ruby/test_m17n.rb
+++ b/test/ruby/test_m17n.rb
@@ -1132,9 +1132,10 @@ class TestM17N < Test::Unit::TestCase
   end
 
   def test_env
+    locale_encoding = Encoding.find("locale")
     ENV.each {|k, v|
-      assert_equal(Encoding::ASCII_8BIT, k.encoding)
-      assert_equal(Encoding::ASCII_8BIT, v.encoding)
+      assert_equal(locale_encoding, k.encoding)
+      assert_equal(locale_encoding, v.encoding)
     }
   end