diff --git a/ChangeLog b/ChangeLog
index 238df30fd1..ac4da7b204 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-20  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* testsuite/test_ghostpad.py:
+	Add while loop in teardown to wait for the pipeline state
+	to hit NULL. Hopefully this will ensure the refcount has always hit 1.
+
 2006-03-14  Edward Hervey  <edward@fluendo.com>
 
 	* configure.ac:
diff --git a/common b/common
index 9200457d08..f1c7bfd24d 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 9200457d08a57f0d7eaeb56915804fa8faf14418
+Subproject commit f1c7bfd24d0fcc4e5113ce3b96b1fac83a9ec560
diff --git a/testsuite/test_ghostpad.py b/testsuite/test_ghostpad.py
index 8f41cffee9..d865a028ee 100644
--- a/testsuite/test_ghostpad.py
+++ b/testsuite/test_ghostpad.py
@@ -71,6 +71,10 @@ class PipeTest(TestCase):
 
     def tearDown(self):
         gst.info("tearDown")
+        while True:
+            (ret, cur, pen) = self.pipeline.get_state()
+            if ret == gst.STATE_CHANGE_SUCCESS and cur == gst.STATE_NULL:
+                break
         self.assertEquals(self.pipeline.__gstrefcount__, 1)
         self.assertEquals(sys.getrefcount(self.pipeline), 3)
         self.assertEquals(self.src.__gstrefcount__, 2)