diff --git a/ChangeLog b/ChangeLog
index 7f99051b3c..9039d28901 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-21  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* check/gst/gstevent.c: (event_probe), (test_event),
+	(GST_START_TEST):
+	 Er, don't call gst_bin_watch_for_state_change you idiot.
+
 2005-08-21  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* check/Makefile.am:
diff --git a/check/gst/gstevent.c b/check/gst/gstevent.c
index 4d2c73eb36..616a393064 100644
--- a/check/gst/gstevent.c
+++ b/check/gst/gstevent.c
@@ -366,7 +366,7 @@ GST_START_TEST (send_custom_events)
       G_GINT64_FORMAT " us", timediff (&got_event_time, &sent_event_time));
 
   gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
-  gst_bin_watch_for_state_change (GST_BIN (pipeline));
+  gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, NULL);
 
   gst_object_unref (pipeline);
 }
diff --git a/common b/common
index c6ca073523..609c7716ba 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit c6ca0735235764a88cb0744eb2c039e961e061ab
+Subproject commit 609c7716bab17e1dc086d3b54b51740300ec6f0f
diff --git a/tests/check/gst/gstevent.c b/tests/check/gst/gstevent.c
index 4d2c73eb36..616a393064 100644
--- a/tests/check/gst/gstevent.c
+++ b/tests/check/gst/gstevent.c
@@ -366,7 +366,7 @@ GST_START_TEST (send_custom_events)
       G_GINT64_FORMAT " us", timediff (&got_event_time, &sent_event_time));
 
   gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
-  gst_bin_watch_for_state_change (GST_BIN (pipeline));
+  gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, NULL);
 
   gst_object_unref (pipeline);
 }