diff --git a/ChangeLog b/ChangeLog
index 7449138971..6c629c6660 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 19 00:54:27 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* test/ruby/test_array.rb (test_count): add a test case for #count
+	  with an argument. See Bug #8654.
+
 Thu Jul 18 23:45:06 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
 	* array.c (rb_ary_eql): compare RARRAY_PTR() for performance
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index b158db0ec9..fdb4c60d59 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -582,6 +582,18 @@ class TestArray < Test::Unit::TestCase
         a2.replace(a1) if i == 0
       end
     EOS
+
+    assert_in_out_err [], <<-EOS, ["[]", "0"], [], bug8654
+      ARY = Array.new(100) { |i| i }
+      class Fixnum
+        def == other
+          ARY.replace([]) if self.equal?(0)
+          p ARY
+          self.equal?(other)
+        end
+      end
+      p ARY.count(42)
+    EOS
   end
 
   def test_delete