diff --git a/ChangeLog b/ChangeLog
index 51d804e1bb..5a09ff9bad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-20  Wim Taymans  <wim@fluendo.com>
+
+	* check/gst/gstcaps.c: (START_TEST), (gst_caps_suite):
+	Testcase to show error in buffer-on-caps serialisation.
+
 2005-06-20  Andy Wingo  <wingo@pobox.com>
 
 	* docs/random/wingo/porting-plugins-to-0.9: A pitiful document I
diff --git a/check/gst/gstcaps.c b/check/gst/gstcaps.c
index 4eefe72f41..9d6bfc57b5 100644
--- a/check/gst/gstcaps.c
+++ b/check/gst/gstcaps.c
@@ -23,6 +23,21 @@
 #include "../gstcheck.h"
 
 
+START_TEST (test_buffer)
+{
+  GstCaps *c1;
+  GstBuffer *buffer;
+
+  buffer = gst_buffer_new_and_alloc (1000);
+  c1 = gst_caps_new_simple ("audio/x-raw-int",
+      "buffer", GST_TYPE_BUFFER, buffer, NULL);
+
+  GST_DEBUG ("caps: %" GST_PTR_FORMAT, c1);
+
+  gst_buffer_unref (buffer);
+}
+
+END_TEST
 START_TEST (test_double_append)
 {
   GstStructure *s1;
@@ -70,6 +85,7 @@ gst_caps_suite (void)
   suite_add_tcase (s, tc_chain);
   tcase_add_test (tc_chain, test_double_append);
   tcase_add_test (tc_chain, test_mutability);
+  tcase_add_test (tc_chain, test_buffer);
   return s;
 }
 
diff --git a/tests/check/gst/gstcaps.c b/tests/check/gst/gstcaps.c
index 4eefe72f41..9d6bfc57b5 100644
--- a/tests/check/gst/gstcaps.c
+++ b/tests/check/gst/gstcaps.c
@@ -23,6 +23,21 @@
 #include "../gstcheck.h"
 
 
+START_TEST (test_buffer)
+{
+  GstCaps *c1;
+  GstBuffer *buffer;
+
+  buffer = gst_buffer_new_and_alloc (1000);
+  c1 = gst_caps_new_simple ("audio/x-raw-int",
+      "buffer", GST_TYPE_BUFFER, buffer, NULL);
+
+  GST_DEBUG ("caps: %" GST_PTR_FORMAT, c1);
+
+  gst_buffer_unref (buffer);
+}
+
+END_TEST
 START_TEST (test_double_append)
 {
   GstStructure *s1;
@@ -70,6 +85,7 @@ gst_caps_suite (void)
   suite_add_tcase (s, tc_chain);
   tcase_add_test (tc_chain, test_double_append);
   tcase_add_test (tc_chain, test_mutability);
+  tcase_add_test (tc_chain, test_buffer);
   return s;
 }