diff --git a/ChangeLog b/ChangeLog
index 5eb77c9870..38f538d52d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ Tue Sep 23 08:25:56 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* hash.c (env_aset): allow nil value to remove an entry.
 	  [ruby-dev:36465]
 
+	* test/ruby/test_env.rb (TestEnv#test_aset): test updated.
+
 Tue Sep 23 08:07:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-keyword-end-re): emacs21 support.  a
diff --git a/test/ruby/test_env.rb b/test/ruby/test_env.rb
index 28f0e87b59..0ee702b222 100644
--- a/test/ruby/test_env.rb
+++ b/test/ruby/test_env.rb
@@ -118,7 +118,8 @@ class TestEnv < Test::Unit::TestCase
         ENV["test"] = "foo"
       end.join
     end
-    assert_raise(TypeError) { ENV["test"] = nil }
+    assert_nothing_raised { ENV["test"] = nil }
+    assert_equal(nil, ENV["test"])
     assert_raise(ArgumentError) { ENV["foo\0bar"] = "test" }
     assert_raise(ArgumentError) { ENV["test"] = "foo\0bar" }
     ENV[PATH_ENV] = "/tmp/".taint