diff --git a/ChangeLog b/ChangeLog
index d42ad5ec3b..de54f561e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun  5 14:11:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/net/imap/test_imap.rb (test_exception_during_shutdown):
+	  need to raise always.
+
 Sat Jun  5 13:13:30 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* lib/matrix.rb (eql?, ==, minor): Fix bugs when comparing/returning
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index 5cf2e97346..cd9b2824a4 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -338,6 +338,7 @@ class IMAPTest < Test::Unit::TestCase
         imap.instance_eval do
           def @sock.shutdown(*args)
             super
+          ensure
             raise "error"
           end
         end