diff --git a/ChangeLog b/ChangeLog
index 33b404314a..16dea32c27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 21 15:42:22 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_in.rb: Skip test_read_buffer_error on cygwin,
+	  because this test repeatedly hangs.
+
 Tue Jun 21 15:35:14 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* LEGAL: Added filenames and copyrights for some files in
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index bfcfbbd06c..9033c375cb 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -1280,7 +1280,7 @@ class TestIO < Test::Unit::TestCase
       t.value
       assert_equal("xxx", s)
     end
-  end
+  end if /cygwin/ !~ RUBY_PLATFORM
 
   def test_write_nonblock
     pipe(proc do |w|