diff --git a/ChangeLog b/ChangeLog
index 0f2ee11120..37febd2e1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep  2 22:43:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io.rb (test_new_with_block): Set autoclose to avoid
+	  EBADF.
+
 Tue Sep  2 22:01:51 2014  Kouhei Sutou  <kou@cozmixng.org>
 
 	* Makefile.in (update-coverage): Remove a never executed line.
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 95331ba02d..3bba329344 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -2282,11 +2282,15 @@ End
   end
 
   def test_new_with_block
-    assert_in_out_err([], "r, w = IO.pipe; IO.new(r.fileno) {}", [], /^.+$/)
+    assert_in_out_err([], "r, w = IO.pipe; r.autoclose=false; IO.new(r.fileno) {}.close", [], /^.+$/)
     n = "IO\u{5165 51fa 529b}"
     c = eval("class #{n} < IO; self; end")
     IO.pipe do |r, w|
-      assert_warning(/#{n}/) {c.new(r.fileno) {}}
+      assert_warning(/#{n}/) {
+        r.autoclose=false
+        io = c.new(r.fileno) {}
+        io.close
+      }
     end
   end