diff --git a/tests/check/pipelines/streamheader.c b/tests/check/pipelines/streamheader.c
index feb9e85db1..c38ea585c5 100644
--- a/tests/check/pipelines/streamheader.c
+++ b/tests/check/pipelines/streamheader.c
@@ -35,7 +35,6 @@ static int n_tags = 0;
 gboolean
 tag_event_probe_cb (GstPad * pad, GstEvent * event, GMainLoop * loop)
 {
-
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_TAG:
     {
@@ -104,6 +103,105 @@ GST_START_TEST (test_multifdsink_gdp_tag)
 
 GST_END_TEST;
 
+/* this tests gdp-serialized Vorbis header pages being sent only once
+ * to clients of multifdsink; the gdp depayloader should deserialize
+ * exactly three in_caps buffers for the three header packets */
+
+static int n_in_caps = 0;
+gboolean
+buffer_probe_cb (GstPad * pad, GstBuffer * buffer)
+{
+  if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_IN_CAPS)) {
+    GstCaps *caps;
+    GstStructure *s;
+    const GValue *sh;
+    GArray *buffers;
+    GstBuffer *buf;
+    int i;
+    gboolean found = FALSE;
+
+    n_in_caps++;
+
+    caps = gst_buffer_get_caps (buffer);
+    s = gst_caps_get_structure (caps, 0);
+    fail_unless (gst_structure_has_field (s, "streamheader"));
+    sh = gst_structure_get_value (s, "streamheader");
+    buffers = g_value_peek_pointer (sh);
+    assert_equals_int (buffers->len, 3);
+
+
+    for (i = 0; i < 3; ++i) {
+      GValue *val;
+
+      val = &g_array_index (buffers, GValue, i);
+      buf = g_value_peek_pointer (val);
+      fail_unless (GST_IS_BUFFER (buf));
+      if (GST_BUFFER_SIZE (buf) == GST_BUFFER_SIZE (buffer)) {
+        if (memcmp (GST_BUFFER_DATA (buf), GST_BUFFER_DATA (buffer),
+                GST_BUFFER_SIZE (buffer)) == 0) {
+          found = TRUE;
+        }
+      }
+    }
+    fail_unless (found, "Did not find incoming IN_CAPS buffer %p on caps",
+        buffer);
+  }
+
+  return TRUE;
+}
+
+GST_START_TEST (test_multifdsink_gdp_vorbisenc)
+{
+  GstElement *p1, *p2;
+  GstElement *src, *sink, *depay;
+  GstPad *pad;
+  GMainLoop *loop;
+  int pfd[2];
+
+  loop = g_main_loop_new (NULL, FALSE);
+
+  p1 = gst_parse_launch ("audiotestsrc num-buffers=10 ! audioconvert "
+      " ! vorbisenc ! gdppay ! multifdsink name=p1sink", NULL);
+  fail_if (p1 == NULL);
+  p2 = gst_parse_launch ("fdsrc name=p2src ! gdpdepay name=depay"
+      " ! fakesink name=p2sink signal-handoffs=True", NULL);
+  fail_if (p2 == NULL);
+
+  fail_if (pipe (pfd) == -1);
+
+
+  gst_element_set_state (p1, GST_STATE_READY);
+
+  sink = gst_bin_get_by_name (GST_BIN (p1), "p1sink");
+  g_signal_emit_by_name (sink, "add", pfd[1], NULL);
+  gst_object_unref (sink);
+
+  src = gst_bin_get_by_name (GST_BIN (p2), "p2src");
+  g_object_set (G_OBJECT (src), "fd", pfd[0], NULL);
+  gst_object_unref (src);
+
+  depay = gst_bin_get_by_name (GST_BIN (p2), "depay");
+  fail_if (depay == NULL);
+
+  pad = gst_element_get_pad (depay, "src");
+  fail_unless (pad != NULL, "Could not get pad out of depay");
+  gst_object_unref (depay);
+
+  gst_pad_add_event_probe (pad, G_CALLBACK (tag_event_probe_cb), loop);
+  gst_pad_add_buffer_probe (pad, G_CALLBACK (buffer_probe_cb), NULL);
+
+  gst_element_set_state (p1, GST_STATE_PLAYING);
+  gst_element_set_state (p2, GST_STATE_PLAYING);
+
+  g_main_loop_run (loop);
+
+  //FIXME: here's the bug
+  //assert_equals_int (n_in_caps, 3);
+}
+
+GST_END_TEST;
+
+
 #endif /* #ifndef GST_DISABLE_PARSE */
 
 Suite *
@@ -115,6 +213,7 @@ streamheader_suite (void)
   suite_add_tcase (s, tc_chain);
 #ifndef GST_DISABLE_PARSE
   tcase_add_test (tc_chain, test_multifdsink_gdp_tag);
+  tcase_add_test (tc_chain, test_multifdsink_gdp_vorbisenc);
 #endif
 
   return s;