diff --git a/tests/check/elements/videofilter.c b/tests/check/elements/videofilter.c
index 2dab03cc0e..c7c8afcaeb 100644
--- a/tests/check/elements/videofilter.c
+++ b/tests/check/elements/videofilter.c
@@ -137,13 +137,16 @@ check_filter (const gchar * name, gint num_buffers, const gchar * prop, ...)
   385, 385}};
   gint i, n, r;
   gint size;
-  GstCaps *templ = gst_caps_from_string (VIDEO_CAPS_TEMPLATE_STRING);
+  GstCaps *allcaps, *templ = gst_caps_from_string (VIDEO_CAPS_TEMPLATE_STRING);
   va_list varargs;
 
-  n = gst_caps_get_size (templ);
+  allcaps = gst_caps_normalize (templ);
+  gst_caps_unref (templ);
+
+  n = gst_caps_get_size (allcaps);
 
   for (i = 0; i < n; i++) {
-    GstStructure *s = gst_caps_get_structure (templ, i);
+    GstStructure *s = gst_caps_get_structure (allcaps, i);
     GstCaps *caps = gst_caps_new_empty ();
 
     gst_caps_append_structure (caps, gst_structure_copy (s));
@@ -169,7 +172,7 @@ check_filter (const gchar * name, gint num_buffers, const gchar * prop, ...)
     gst_caps_unref (caps);
   }
 
-  gst_caps_unref (templ);
+  gst_caps_unref (allcaps);
 }
 
 GST_START_TEST (test_videobalance)
diff --git a/tests/check/elements/y4menc.c b/tests/check/elements/y4menc.c
index 991b4d268f..75935377f2 100644
--- a/tests/check/elements/y4menc.c
+++ b/tests/check/elements/y4menc.c
@@ -99,7 +99,7 @@ GST_START_TEST (test_y4m)
   /* makes valgrind's memcheck happier */
   gst_buffer_memset (inbuffer, 0, 0, size);
   caps = gst_caps_from_string (VIDEO_CAPS_STRING);
-  gst_pad_set_caps (mysrcpad, caps);
+  fail_unless (gst_pad_set_caps (mysrcpad, caps));
   gst_caps_unref (caps);
   GST_BUFFER_TIMESTAMP (inbuffer) = 0;
   ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);