diff --git a/ChangeLog b/ChangeLog
index 47cbe0ef5a..4ee954c57a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 27 10:58:17 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/readline/test_readline.rb (setup): avoid affected by user's
+	  inputrc file.  [ruby-dev:45584][Bug #6357]
+
 Fri Apr 27 01:45:05 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* thread.c (rb_threadptr_execute_interrupts_common):
diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
index d822f5ceaf..9ac67ca991 100644
--- a/test/readline/test_readline.rb
+++ b/test/readline/test_readline.rb
@@ -36,7 +36,14 @@ else
 end
 
 class TestReadline < Test::Unit::TestCase
+  INPUTRC = "INPUTRC"
+
+  def setup
+    @inputrc, ENV[INPUTRC] = ENV[INPUTRC], IO::NULL
+  end
+
   def teardown
+    ENV[INPUTRC] = @inputrc
     Readline.instance_variable_set("@completion_proc", nil)
   end