diff --git a/ChangeLog b/ChangeLog
index 8da7ca8ae3..fc2a298598 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-14  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* libs/gst/check/gstcheck.c: (gst_check_init):
+	  Intercept criticals and warnings in the Gst-Phonon log domain, so
+	  ASSERT_CRITICAL() etc. can be used in gst-phonon's unit tests as
+	  well.
+	
 2007-06-14  Edward Hervey  <edward@fluendo.com>
 
 	* gst/gstparamspecs.c: (_gst_param_fraction_validate):
diff --git a/libs/gst/check/gstcheck.c b/libs/gst/check/gstcheck.c
index 85fab69216..a54c51b6a6 100644
--- a/libs/gst/check/gstcheck.c
+++ b/libs/gst/check/gstcheck.c
@@ -95,6 +95,8 @@ gst_check_init (int *argc, char **argv[])
       gst_check_log_critical_func, NULL);
   g_log_set_handler ("GLib-GObject", G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING,
       gst_check_log_critical_func, NULL);
+  g_log_set_handler ("Gst-Phonon", G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING,
+      gst_check_log_critical_func, NULL);
 
   check_cond = g_cond_new ();
   check_mutex = g_mutex_new ();