diff --git a/ChangeLog b/ChangeLog
index 356e2376aa..9d289d6870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-26  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* testsuite/test_event.py:
+	  fix race condition because of state thread
+
 2005-10-26  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* testsuite/test_bin.py:
diff --git a/testsuite/test_event.py b/testsuite/test_event.py
index ca8a73d374..33418573e4 100644
--- a/testsuite/test_event.py
+++ b/testsuite/test_event.py
@@ -22,6 +22,8 @@
 
 import os
 import sys
+import time
+
 from common import gst, unittest, testhelper, TestCase
 
 class EventTest(TestCase):
@@ -35,6 +37,11 @@ class EventTest(TestCase):
         gst.debug('setting pipeline to NULL')
         self.pipeline.set_state(gst.STATE_NULL)
         gst.debug('set pipeline to NULL')
+        # FIXME: wait for state change thread to die
+        while self.pipeline.__gstrefcount__ > 1:
+            gst.debug('waiting for self.pipeline G rc to drop to 1')
+            time.sleep(0.1)
+        self.assertEquals(self.pipeline.__gstrefcount__, 1)
 
         del self.sink
         del self.pipeline