diff --git a/ChangeLog b/ChangeLog
index a2d350d9b6..8c8a573e7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* testsuite/Makefile.am:
+	* testsuite/test_ghostpad.py:
+	  add new testsuite for ghost pad behaviour
+
 2005-10-05  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gst.defs:
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 4df6010b65..fc6c0e1264 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -23,6 +23,7 @@ tests =  \
         test_caps.py \
 	test_element.py \
 	test_event.py \
+	test_ghostpad.py \
         test_interface.py \
 	test_pad.py \
         test_pipeline.py \
diff --git a/testsuite/test_ghostpad.py b/testsuite/test_ghostpad.py
new file mode 100644
index 0000000000..d523c6a085
--- /dev/null
+++ b/testsuite/test_ghostpad.py
@@ -0,0 +1,117 @@
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+#
+# gst-python - Python bindings for GStreamer
+# Copyright (C) 2002 David I. Lehn
+# Copyright (C) 2004 Johan Dahlin
+# Copyright (C) 2005 Edward Hervey
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+
+from common import gst, unittest, TestCase
+
+import sys
+import gc
+import gobject
+
+class SrcBin(gst.Bin):
+    def prepare(self):
+        src = gst.element_factory_make('fakesrc')
+        self.add(src)
+        pad = src.get_pad("src")
+        ghostpad = gst.GhostPad("ghostsrc", pad)
+        self.add_pad(ghostpad)
+gobject.type_register(SrcBin)
+
+class SinkBin(gst.Bin):
+    def prepare(self):
+        sink = gst.element_factory_make('fakesink')
+        self.add(sink)
+        pad = sink.get_pad("sink")
+        ghostpad = gst.GhostPad("ghostsink", pad)
+        self.add_pad(ghostpad)
+gobject.type_register(SinkBin)
+
+        
+class PipeTest(TestCase):
+    def setUp(self):
+        self.gctrack()
+        self.pipeline = gst.Pipeline()
+        self.assertEquals(self.pipeline.__gstrefcount__, 1)
+        self.assertEquals(sys.getrefcount(self.pipeline), 3)
+
+        self.src = SrcBin()
+        self.src.prepare()
+        self.sink = SinkBin()
+        self.sink.prepare()
+        self.assertEquals(self.src.__gstrefcount__, 1)
+        self.assertEquals(sys.getrefcount(self.src), 3)
+
+        self.pipeline.add(self.src, self.sink)
+        self.assertEquals(self.src.__gstrefcount__, 2) # added
+        self.assertEquals(sys.getrefcount(self.src), 3)
+        self.assertEquals(self.sink.__gstrefcount__, 2) # added
+        self.assertEquals(sys.getrefcount(self.sink), 3)
+
+        self.src.link(self.sink)
+
+        self.assertEquals(self.pipeline.__gstrefcount__, 1)
+        self.assertEquals(sys.getrefcount(self.pipeline), 3)
+        self.assertEquals(self.src.__gstrefcount__, 2)
+        self.assertEquals(sys.getrefcount(self.src), 3)
+        self.assertEquals(self.sink.__gstrefcount__, 2)
+        self.assertEquals(sys.getrefcount(self.sink), 3)
+
+    def tearDown(self):
+        self.assertEquals(self.pipeline.__gstrefcount__, 1)
+        self.assertEquals(sys.getrefcount(self.pipeline), 3)
+        self.assertEquals(self.src.__gstrefcount__, 2)
+        self.assertEquals(sys.getrefcount(self.src), 3)
+        self.assertEquals(self.sink.__gstrefcount__, 2)
+        self.assertEquals(sys.getrefcount(self.sink), 3)
+        gst.debug('deleting pipeline')
+        del self.pipeline
+        self.gccollect()
+
+        self.assertEquals(self.src.__gstrefcount__, 1) # parent gone
+        self.assertEquals(self.sink.__gstrefcount__, 1) # parent gone
+        self.assertEquals(sys.getrefcount(self.src), 3)
+        self.assertEquals(sys.getrefcount(self.sink), 3)
+        gst.debug('deleting src')
+        del self.src
+        self.gccollect()
+        gst.debug('deleting sink')
+        del self.sink
+        self.gccollect()
+
+        self.gcverify()
+        
+    def test(self):
+        self.pipeline.set_state_async(gst.STATE_PLAYING)
+        while True:
+            (ret, cur, pen) = self.pipeline.get_state(timeout=None)
+            if ret == gst.STATE_CHANGE_SUCCESS and cur == gst.STATE_PLAYING:
+                break
+
+        self.pipeline.set_state_async(gst.STATE_NULL)
+        while True:
+            (ret, cur, pen) = self.pipeline.get_state(timeout=None)
+            if ret == gst.STATE_CHANGE_SUCCESS and cur == gst.STATE_NULL:
+                break
+        
+        pass
+
+if __name__ == "__main__":
+    unittest.main()