diff --git a/ChangeLog b/ChangeLog
index 27017c9d4a..ed4a21aa0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-23  Wim Taymans  <wim@fluendo.com>
+
+	* tests/check/libs/cddabasesrc.c: (GST_START_TEST):
+	Waits for tasks to settle down so that we clean up correctly for 
+	valgrind.
+
 2006-08-23  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* tests/check/libs/tag.c: (GST_START_TEST), (taglists_are_equal):
diff --git a/tests/check/libs/cddabasesrc.c b/tests/check/libs/cddabasesrc.c
index 0556c99051..09728e21c2 100644
--- a/tests/check/libs/cddabasesrc.c
+++ b/tests/check/libs/cddabasesrc.c
@@ -295,7 +295,7 @@ GST_START_TEST (test_discid_calculations)
   foosrc = gst_element_factory_make ("cdfoosrc", "cdfoosrc");
 
   for (i = 0; i < G_N_ELEMENTS (test_discs); ++i) {
-    GST_LOG ("Testing disc layout %u ...\n", i);
+    GST_LOG ("Testing disc layout %u ...", i);
     GST_CD_FOO_SRC (foosrc)->cur_disc = i;
     gst_element_set_state (foosrc, GST_STATE_PLAYING);
     gst_element_get_state (foosrc, NULL, NULL, -1);
@@ -303,6 +303,8 @@ GST_START_TEST (test_discid_calculations)
   }
 
   gst_object_unref (foosrc);
+
+  gst_task_cleanup_all ();
 }
 
 GST_END_TEST;
@@ -347,6 +349,7 @@ GST_START_TEST (test_buffer_timestamps)
 
   gst_buffer_straw_stop_pipeline (pipeline, sinkpad);
 
+  gst_task_cleanup_all ();
   gst_object_unref (pipeline);
   gst_object_unref (sinkpad);
 }