diff --git a/ChangeLog b/ChangeLog
index cdc4fedd4a..0a705d01bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-07  Edward Hervey  <edward@fluendo.com>
+
+	* testsuite/test_ghostpad.py:
+	more assertions to figure out an speed issue.
+
 2006-04-07  Andy Wingo  <wingo@pobox.com>
 
 	* gst/arg-types.py (GstCapsArg.beforenull): py_caps can be NULL if
diff --git a/testsuite/test_ghostpad.py b/testsuite/test_ghostpad.py
index de96e32ad7..d23226e3d5 100644
--- a/testsuite/test_ghostpad.py
+++ b/testsuite/test_ghostpad.py
@@ -100,7 +100,7 @@ class PipeTest(TestCase):
         self.sink.connect_handoff(self._sink_handoff_cb)
         self._handoffs = 0
 
-        self.pipeline.set_state(gst.STATE_PLAYING)
+        self.assertTrue(self.pipeline.set_state(gst.STATE_PLAYING) != gst.STATE_CHANGE_FAILURE)
         while True:
             (ret, cur, pen) = self.pipeline.get_state()
             if ret == gst.STATE_CHANGE_SUCCESS and cur == gst.STATE_PLAYING:
@@ -109,7 +109,7 @@ class PipeTest(TestCase):
         while self._handoffs < 10:
                 pass
 
-        self.pipeline.set_state(gst.STATE_NULL)
+        self.assertEquals(self.pipeline.set_state(gst.STATE_NULL), gst.STATE_CHANGE_SUCCESS)
         while True:
             (ret, cur, pen) = self.pipeline.get_state()
             if ret == gst.STATE_CHANGE_SUCCESS and cur == gst.STATE_NULL: