diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 3094a7e97f..f0e597feef 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -83,6 +83,7 @@ REGISTRY_CHECKS =				\
 	elements/selector			\
 	elements/tee			  	\
 	elements/queue                          \
+	elements/queue2                         \
 	elements/valve                          \
 	libs/basesrc				\
 	libs/basesink				\
diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore
index 8ab5437ad5..1178115409 100644
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@@ -9,6 +9,7 @@ funnel
 identity
 multiqueue
 queue
+queue2
 selector
 tee
 valve
diff --git a/tests/check/elements/queue2.c b/tests/check/elements/queue2.c
new file mode 100644
index 0000000000..f226e0e7fb
--- /dev/null
+++ b/tests/check/elements/queue2.c
@@ -0,0 +1,225 @@
+/* GStreamer unit tests for queue2
+ *
+ * Copyright (C) 2011 Tim-Philipp Müller <tim centricular net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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.
+ */
+
+#include <gst/check/gstcheck.h>
+
+static GstElement *
+setup_queue2 (GstElement * pipe, GstElement * input, GstElement * output)
+{
+  GstElement *queue2;
+  GstPad *sinkpad, *srcpad;
+
+  queue2 = gst_element_factory_make ("queue2", NULL);
+  fail_unless (queue2 != NULL, "failed to create 'queue2' element");
+
+  gst_bin_add (GST_BIN (pipe), queue2);
+  gst_bin_add (GST_BIN (pipe), input);
+  gst_bin_add (GST_BIN (pipe), output);
+
+  sinkpad = gst_element_get_static_pad (queue2, "sink");
+  fail_unless (sinkpad != NULL, "failed to get queue2 sink pad");
+
+  srcpad = gst_element_get_static_pad (input, "src");
+  fail_unless (srcpad != NULL, "failed to find src pad for input element");
+
+  fail_unless_equals_int (GST_PAD_LINK_OK, gst_pad_link (srcpad, sinkpad));
+  gst_object_unref (srcpad);
+  gst_object_unref (sinkpad);
+
+  srcpad = gst_element_get_static_pad (queue2, "src");
+  fail_unless (srcpad != NULL);
+
+  sinkpad = gst_element_get_static_pad (output, "sink");
+  fail_unless (sinkpad != NULL, "failed to find sink pad of output element");
+
+  fail_unless_equals_int (GST_PAD_LINK_OK, gst_pad_link (srcpad, sinkpad));
+
+  gst_object_unref (srcpad);
+  gst_object_unref (sinkpad);
+
+  return queue2;
+}
+
+GST_START_TEST (test_simple_pipeline)
+{
+  GstElement *pipe, *queue2, *input, *output;
+  GstMessage *msg;
+
+  pipe = gst_pipeline_new ("pipeline");
+
+  input = gst_element_factory_make ("fakesrc", NULL);
+  fail_unless (input != NULL, "failed to create 'fakesrc' element");
+  g_object_set (input, "num-buffers", 256, "sizetype", 3, NULL);
+
+  output = gst_element_factory_make ("fakesink", NULL);
+  fail_unless (output != NULL, "failed to create 'fakesink' element");
+
+  queue2 = setup_queue2 (pipe, input, output);
+
+  gst_element_set_state (pipe, GST_STATE_PLAYING);
+
+  msg = gst_bus_poll (GST_ELEMENT_BUS (pipe),
+      GST_MESSAGE_EOS | GST_MESSAGE_ERROR, -1);
+
+  fail_if (GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ERROR,
+      "Expected EOS message, got ERROR message");
+  gst_message_unref (msg);
+
+  GST_LOG ("Got EOS, cleaning up");
+
+  gst_element_set_state (pipe, GST_STATE_NULL);
+  gst_object_unref (pipe);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_simple_pipeline_ringbuffer)
+{
+  GstElement *pipe, *queue2, *input, *output;
+  GstMessage *msg;
+
+  pipe = gst_pipeline_new ("pipeline");
+
+  input = gst_element_factory_make ("fakesrc", NULL);
+  fail_unless (input != NULL, "failed to create 'fakesrc' element");
+  g_object_set (input, "num-buffers", 256, "sizetype", 3, NULL);
+
+  output = gst_element_factory_make ("fakesink", NULL);
+  fail_unless (output != NULL, "failed to create 'fakesink' element");
+
+  queue2 = setup_queue2 (pipe, input, output);
+  g_object_set (queue2, "ring-buffer-max-size", (guint64) 1024 * 50, NULL);
+
+  gst_element_set_state (pipe, GST_STATE_PLAYING);
+
+  msg = gst_bus_poll (GST_ELEMENT_BUS (pipe),
+      GST_MESSAGE_EOS | GST_MESSAGE_ERROR, -1);
+
+  fail_if (GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ERROR,
+      "Expected EOS message, got ERROR message");
+  gst_message_unref (msg);
+
+  GST_LOG ("Got EOS, cleaning up");
+
+  gst_element_set_state (pipe, GST_STATE_NULL);
+  gst_object_unref (pipe);
+}
+
+GST_END_TEST;
+
+static void
+do_test_simple_shutdown_while_running (guint64 ring_buffer_max_size)
+{
+  GstElement *pipe, *q2;
+  GstElement *input;
+  GstElement *output;
+  GstMessage *msg;
+
+  pipe = gst_pipeline_new ("pipeline");
+
+  input = gst_element_factory_make ("fakesrc", NULL);
+  fail_unless (input != NULL, "failed to create 'fakesrc' element");
+  g_object_set (input, "format", GST_FORMAT_TIME, "sizetype", 2,
+      "sizemax", 10, NULL);
+
+  output = gst_element_factory_make ("fakesink", NULL);
+  fail_unless (output != NULL, "failed to create 'fakesink' element");
+
+  q2 = setup_queue2 (pipe, input, output);
+
+  if (ring_buffer_max_size > 0) {
+    g_object_set (q2, "ring-buffer-max-size", ring_buffer_max_size,
+        "temp-template", NULL, NULL);
+  }
+
+  gst_element_set_state (pipe, GST_STATE_PAUSED);
+
+  /* wait until pipeline is up and running */
+  msg = gst_bus_poll (GST_ELEMENT_BUS (pipe),
+      GST_MESSAGE_ERROR | GST_MESSAGE_ASYNC_DONE, -1);
+  fail_if (GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ERROR, "Got ERROR message");
+  gst_message_unref (msg);
+
+  GST_LOG ("pipeline is running now");
+  gst_element_set_state (pipe, GST_STATE_PLAYING);
+  g_usleep (G_USEC_PER_SEC / 20);
+
+  /* now shut down only the sink, so the queue gets a wrong-state flow return */
+  gst_element_set_state (output, GST_STATE_NULL);
+  GST_LOG ("Cleaning up");
+
+  gst_element_set_state (pipe, GST_STATE_NULL);
+  gst_object_unref (pipe);
+}
+
+GST_START_TEST (test_simple_shutdown_while_running)
+{
+  int i;
+
+  /* run a couple of iterations, gives higher chance of different code paths
+   * being executed at time the flush is detected (esp. useful to make sure
+   * things are cleaned up properly when running under valgrind) */
+  for (i = 0; i < 10; ++i) {
+    do_test_simple_shutdown_while_running (0);
+  }
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_simple_shutdown_while_running_ringbuffer)
+{
+  int i;
+
+  /* run a couple of iterations, gives higher chance of different code paths
+   * being executed at time the flush is detected (esp. useful to make sure
+   * things are cleaned up properly when running under valgrind) */
+  for (i = 0; i < 10; ++i) {
+    do_test_simple_shutdown_while_running (1024 * 1024);
+  }
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_simple_create_destroy)
+{
+  GstElement *queue2;
+
+  queue2 = gst_element_factory_make ("queue2", NULL);
+  gst_object_unref (queue2);
+}
+
+GST_END_TEST;
+
+static Suite *
+queue2_suite (void)
+{
+  Suite *s = suite_create ("queue2");
+  TCase *tc_chain = tcase_create ("general");
+
+  suite_add_tcase (s, tc_chain);
+  tcase_add_test (tc_chain, test_simple_create_destroy);
+  tcase_add_test (tc_chain, test_simple_pipeline);
+  tcase_add_test (tc_chain, test_simple_pipeline_ringbuffer);
+  tcase_add_test (tc_chain, test_simple_shutdown_while_running);
+  tcase_add_test (tc_chain, test_simple_shutdown_while_running_ringbuffer);
+  return s;
+}
+
+GST_CHECK_MAIN (queue2)