diff --git a/ChangeLog b/ChangeLog
index 1e99ffe68e..f63f05bea9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-10  Michael Smith <msmith@fluendo.com>
+
+	* gst/audiorate/gstaudiorate.c: (gst_audio_rate_chain):
+	  Debug output fixes.
+	* tests/check/elements/audiorate.c: (do_perfect_stream_test),
+	(GST_START_TEST):
+	  Change the number of buffers used; 500 is too many and leads to
+	  timeouts.
+
 2007-08-10  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/playback/gstqueue2.c:
diff --git a/gst/audiorate/gstaudiorate.c b/gst/audiorate/gstaudiorate.c
index 8662adcd31..c1bd2857bc 100644
--- a/gst/audiorate/gstaudiorate.c
+++ b/gst/audiorate/gstaudiorate.c
@@ -551,10 +551,6 @@ gst_audio_rate_chain (GstPad * pad, GstBuffer * buf)
     while (fillsamples > 0) {
       guint64 cursamples = MIN (fillsamples, audiorate->rate);
 
-      GST_DEBUG_OBJECT (audiorate,
-          "inserting %lld samples of total %lld at ts %lld", cursamples,
-          fillsamples, audiorate->next_ts);
-
       fillsamples -= cursamples;
       fillsize = cursamples * audiorate->bytes_per_sample;
 
diff --git a/tests/check/elements/audiorate.c b/tests/check/elements/audiorate.c
index 2cfc759635..7e7616c7da 100644
--- a/tests/check/elements/audiorate.c
+++ b/tests/check/elements/audiorate.c
@@ -209,7 +209,7 @@ do_perfect_stream_test (guint rate, guint width, gdouble drop_probability,
   src = gst_element_factory_make ("audiotestsrc", "audiotestsrc");
   fail_unless (src != NULL);
 
-  g_object_set (src, "num-buffers", 500, NULL);
+  g_object_set (src, "num-buffers", 100, NULL);
 
   conv = gst_element_factory_make ("audioconvert", "audioconvert");
   fail_unless (conv != NULL);
@@ -445,7 +445,6 @@ GST_START_TEST (test_large_discont)
 
 GST_END_TEST;
 
-
 static Suite *
 audiorate_suite (void)
 {