diff --git a/ChangeLog b/ChangeLog
index ede07b659d..b33c885f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-11  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* tests/check/pipelines/metadata.c:
+	Make the metadata test not fail when jpegenc isn't available....
+	as it isn't here, because it's not in this module, and
+	therefore not in the plugin path when the check runs.
+
 2008-10-10  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio),
diff --git a/tests/check/pipelines/metadata.c b/tests/check/pipelines/metadata.c
index c12823fbee..4ca8179c53 100644
--- a/tests/check/pipelines/metadata.c
+++ b/tests/check/pipelines/metadata.c
@@ -95,7 +95,10 @@ test_tags (const gchar * tag_str)
   g_object_set (G_OBJECT (videotestsrc), "num-buffers", 1, NULL);
 
   jpegenc = gst_element_factory_make ("jpegenc", "enc");
-  fail_unless (jpegenc != NULL);
+  if (jpegenc == NULL) {
+    g_print ("Cannot test - jpegenc not available\n");
+    return;
+  }
 
   metadatamux = gst_element_factory_make ("metadatamux", "mux");
   g_object_set (G_OBJECT (metadatamux), "exif", TRUE, NULL);