diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 9ac197cde0..c5ab01346f 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -130,6 +130,7 @@ check_PROGRAMS = \
 	elements/playbin-compressed \
 	$(check_pango)              \
 	$(check_subparse)           \
+	elements/videoconvert       \
 	elements/videorate          \
 	elements/videoscale         \
 	elements/videotestsrc       \
@@ -388,6 +389,14 @@ elements_vorbistag_CFLAGS = \
 	$(VORBIS_CFLAGS) \
 	$(CFLAGS)
 
+elements_videoconvert_CFLAGS = \
+	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_BASE_CFLAGS) \
+	$(AM_CFLAGS)
+elements_videoconvert_LDADD = \
+	$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \
+	$(GST_BASE_LIBS) $(LDADD)
+
 elements_videoscale_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
diff --git a/tests/check/elements/videoconvert.c b/tests/check/elements/videoconvert.c
new file mode 100644
index 0000000000..bc8047eda8
--- /dev/null
+++ b/tests/check/elements/videoconvert.c
@@ -0,0 +1,131 @@
+/* GStreamer
+ * unit test for videoconvert
+ *
+ * Copyright (C) 2006-2012 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef HAVE_VALGRIND
+# include <valgrind/valgrind.h>
+#endif
+
+#include <gst/check/gstcheck.h>
+#include <gst/video/video.h>
+
+static guint
+get_num_formats (void)
+{
+  guint i = 2;
+
+  while (gst_video_format_to_string ((GstFormat) i) != NULL)
+    ++i;
+
+  return i;
+}
+
+static void
+check_pad_template (GstPadTemplate * tmpl)
+{
+  const GValue *list_val, *fmt_val;
+  GstStructure *s;
+  gboolean *formats_supported;
+  GstCaps *caps;
+  guint i, num_formats;
+
+  num_formats = get_num_formats ();
+  formats_supported = g_new0 (gboolean, num_formats);
+
+  caps = gst_pad_template_get_caps (tmpl);
+
+  /* If this fails, we need to update this unit test */
+  fail_unless_equals_int (gst_caps_get_size (caps), 1);
+  s = gst_caps_get_structure (caps, 0);
+
+  fail_unless (gst_structure_has_name (s, "video/x-raw"));
+
+  list_val = gst_structure_get_value (s, "format");
+  fail_unless (list_val != NULL);
+  /* If this fails, we need to update this unit test */
+  fail_unless (GST_VALUE_HOLDS_LIST (list_val));
+
+  for (i = 0; i < gst_value_list_get_size (list_val); ++i) {
+    GstVideoFormat fmt;
+    const gchar *fmt_str;
+
+    fmt_val = gst_value_list_get_value (list_val, i);
+    fail_unless (G_VALUE_HOLDS_STRING (fmt_val));
+    fmt_str = g_value_get_string (fmt_val);
+    GST_LOG ("format string: '%s'", fmt_str);
+    fmt = gst_video_format_from_string (fmt_str);
+    fail_unless (fmt != GST_VIDEO_FORMAT_UNKNOWN);
+    formats_supported[(guint) fmt] = TRUE;
+  }
+
+  gst_caps_unref (caps);
+
+  for (i = 2; i < num_formats; ++i) {
+    if (!formats_supported[i]) {
+      g_error ("videoconvert doesn't support format '%s'",
+          gst_video_format_to_string ((GstVideoFormat) i));
+    }
+  }
+
+  g_free (formats_supported);
+}
+
+GST_START_TEST (test_template_formats)
+{
+  GstElementFactory *f;
+  GstPadTemplate *t;
+  const GList *pad_templates;
+
+  f = gst_element_factory_find ("videoconvert");
+  fail_unless (f != NULL);
+
+  pad_templates = gst_element_factory_get_static_pad_templates (f);
+  fail_unless_equals_int (g_list_length ((GList *) pad_templates), 2);
+
+  t = gst_static_pad_template_get (pad_templates->data);
+  check_pad_template (GST_PAD_TEMPLATE (t));
+  gst_object_unref (t);
+  t = gst_static_pad_template_get (pad_templates->next->data);
+  check_pad_template (GST_PAD_TEMPLATE (t));
+  gst_object_unref (t);
+
+  gst_object_unref (f);
+}
+
+GST_END_TEST;
+
+static Suite *
+videoconvert_suite (void)
+{
+  Suite *s = suite_create ("videoconvert");
+  TCase *tc_chain = tcase_create ("general");
+
+  suite_add_tcase (s, tc_chain);
+
+  tcase_add_test (tc_chain, test_template_formats);
+
+  return s;
+}
+
+GST_CHECK_MAIN (videoconvert);