diff --git a/tests/check/elements/aiffparse.c b/tests/check/elements/aiffparse.c
index ebf2028c6b..5828ce14f4 100644
--- a/tests/check/elements/aiffparse.c
+++ b/tests/check/elements/aiffparse.c
@@ -112,15 +112,21 @@ sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
       gst_event_parse_tag (event, &aiff_tags);
       fail_unless (aiff_tags != NULL);
 
+      have_tags = TRUE;
       for (i = 0; i < sizeof (tags) / sizeof (*tags); i++) {
         buf = NULL;
-        fail_unless (gst_tag_list_get_string (aiff_tags, tags[i][0], &buf));
+        if (!gst_tag_list_get_string (aiff_tags, tags[i][0], &buf)) {
+          have_tags = FALSE;
+          continue;
+        }
         ret = g_strcmp0 (buf, tags[i][1]);
         g_free (buf);
-        fail_unless (ret == 0);
+        if (ret != 0) {
+          have_tags = FALSE;
+          continue;
+        }
       }
 
-      have_tags = TRUE;
       break;
     }
     default: