diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 1a1a2592fc..0954a81b4b 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -29,6 +29,7 @@ check_PROGRAMS = \
 	gst/rtspserver \
 	gst/client \
 	gst/mountpoints \
+	gst/mediafactory \
 	gst/addresspool
 
 # these tests don't even pass
diff --git a/tests/check/gst/mediafactory.c b/tests/check/gst/mediafactory.c
new file mode 100644
index 0000000000..46ff8252ae
--- /dev/null
+++ b/tests/check/gst/mediafactory.c
@@ -0,0 +1,147 @@
+/* GStreamer
+ * Copyright (C) 2012 Wim Taymans <wim.taymans@gmail.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gst/check/gstcheck.h>
+
+#include <rtsp-media-factory.h>
+
+GST_START_TEST (test_parse_error)
+{
+  GstRTSPMediaFactory *factory;
+  GstRTSPUrl *url;
+
+  factory = gst_rtsp_media_factory_new ();
+
+  gst_rtsp_media_factory_set_launch (factory, "foo");
+  gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url);
+  ASSERT_CRITICAL (gst_rtsp_media_factory_create_element (factory, url));
+  ASSERT_CRITICAL (gst_rtsp_media_factory_construct (factory, url));
+
+  gst_rtsp_url_free (url);
+  g_object_unref (factory);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_launch)
+{
+  GstRTSPMediaFactory *factory;
+  GstElement *element;
+  GstRTSPUrl *url;
+
+  factory = gst_rtsp_media_factory_new ();
+  fail_if (gst_rtsp_media_factory_is_shared (factory));
+  gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url);
+
+  gst_rtsp_media_factory_set_launch (factory,
+      "( videotestsrc ! rtpvrawpay pt=96 name=pay0 )");
+
+  element = gst_rtsp_media_factory_create_element (factory, url);
+  fail_unless (GST_IS_BIN (element));
+  fail_if (GST_IS_PIPELINE (element));
+  gst_object_unref (element);
+
+  gst_rtsp_url_free (url);
+  g_object_unref (factory);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_launch_construct)
+{
+  GstRTSPMediaFactory *factory;
+  GstRTSPMedia *media, *media2;
+  GstRTSPUrl *url;
+
+  factory = gst_rtsp_media_factory_new ();
+  fail_if (gst_rtsp_media_factory_is_shared (factory));
+  gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url);
+
+  gst_rtsp_media_factory_set_launch (factory,
+      "( videotestsrc ! rtpvrawpay pt=96 name=pay0 )");
+
+  media = gst_rtsp_media_factory_construct (factory, url);
+  fail_unless (GST_IS_RTSP_MEDIA (media));
+  g_object_unref (media);
+
+  media2 = gst_rtsp_media_factory_construct (factory, url);
+  fail_unless (GST_IS_RTSP_MEDIA (media2));
+  fail_if (media == media2);
+  g_object_unref (media2);
+
+  gst_rtsp_url_free (url);
+  g_object_unref (factory);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_shared)
+{
+  GstRTSPMediaFactory *factory;
+  GstElement *element;
+  GstRTSPMedia *media, *media2;
+  GstRTSPUrl *url;
+
+  factory = gst_rtsp_media_factory_new ();
+  gst_rtsp_media_factory_set_shared (factory, TRUE);
+  fail_unless (gst_rtsp_media_factory_is_shared (factory));
+
+  gst_rtsp_url_parse ("rtsp://localhost:8554/test", &url);
+
+  gst_rtsp_media_factory_set_launch (factory,
+      "( videotestsrc ! rtpvrawpay pt=96 name=pay0 )");
+
+  element = gst_rtsp_media_factory_create_element (factory, url);
+  fail_unless (GST_IS_BIN (element));
+  fail_if (GST_IS_PIPELINE (element));
+  gst_object_unref (element);
+
+  media = gst_rtsp_media_factory_construct (factory, url);
+  fail_unless (GST_IS_RTSP_MEDIA (media));
+
+  media2 = gst_rtsp_media_factory_construct (factory, url);
+  fail_unless (GST_IS_RTSP_MEDIA (media2));
+  fail_unless (media == media2);
+
+  g_object_unref (media);
+  g_object_unref (media2);
+
+  gst_rtsp_url_free (url);
+  g_object_unref (factory);
+}
+
+GST_END_TEST;
+
+static Suite *
+rtspmediafactory_suite (void)
+{
+  Suite *s = suite_create ("rtspmediafactory");
+  TCase *tc = tcase_create ("general");
+
+  suite_add_tcase (s, tc);
+  tcase_set_timeout (tc, 20);
+  tcase_add_test (tc, test_parse_error);
+  tcase_add_test (tc, test_launch);
+  tcase_add_test (tc, test_launch_construct);
+  tcase_add_test (tc, test_shared);
+
+  return s;
+}
+
+GST_CHECK_MAIN (rtspmediafactory);