diff --git a/ChangeLog b/ChangeLog
index 9d289d6870..f4816f5b0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-26  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* testsuite/test_bus.py:
+	  fix race condition because of state thread
+
 2005-10-26  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* testsuite/test_event.py:
diff --git a/testsuite/test_bus.py b/testsuite/test_bus.py
index 18eb70e86a..0326591c90 100644
--- a/testsuite/test_bus.py
+++ b/testsuite/test_bus.py
@@ -21,6 +21,7 @@
 from common import gst, unittest, TestCase
 
 import gobject
+import time
 
 class BusSignalTest(TestCase):
     def testGoodConstructor(self):
@@ -68,6 +69,10 @@ class BusSignalTest(TestCase):
         gst.info("set to NULL %s" % ret)
         self.gccollect()
         self.assertEquals(bus.__gstrefcount__, 3)
+        # FIXME: state change thread needs to die
+        while pipeline.__gstrefcount__ > 1:
+            gst.debug('waiting for pipeline refcount to drop')
+            time.sleep(0.1)
         self.assertEquals(pipeline.__gstrefcount__, 1)
 
         gst.info("about to remove the watch id")