diff --git a/ChangeLog b/ChangeLog
index e0e6905007..a4f0a473bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 13 23:32:16 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/ruby/test_io.rb (TestIO): revert r35631. it broke the intent of
+	  test_flush_in_finalizer1.  [ruby-core:43951] [Bug ##6228]
+
 Sun May 13 22:46:36 2012  Tanaka Akira  <akr@fsij.org>
 
 	* ext/etc/etc.c (passwd_ensure): move endpwent() call from
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 94e87bf25a..ebf9b760dd 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -10,14 +10,6 @@ require 'weakref'
 require_relative 'envutil'
 
 class TestIO < Test::Unit::TestCase
-  def setup
-    GC.disable
-  end
-
-  def teardown
-    GC.enable
-  end
-
   def have_close_on_exec?
     begin
       $stdin.close_on_exec?