diff --git a/ChangeLog b/ChangeLog
index 894e9eaa9b..7fc11a62cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan  5 14:58:01 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_io.rb: added timeout for AIX environment.
+	  [ruby-core:62983][Bug #9917]
+
 Mon Jan  5 10:57:24 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/ostruct.rb (modifiable?, new_ostruct_member!, table!):
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 02381b132c..935ee24d83 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -3051,7 +3051,7 @@ End
       }
 
       IO.select(tempfiles)
-  }, bug8080
+    }, bug8080, timeout: 30
   end
 
   def test_read_32bit_boundary