diff --git a/ChangeLog b/ChangeLog
index f48906c682..81b08e2466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-03  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* tests/check/Makefile.am:
+	  Only run the id3v2mux check if taglib is available and
+	  the taglib plugin has been built.
+
 2006-04-03  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/swfdec/Makefile.am:
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index d363750485..ba7b0de6a7 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -26,8 +26,15 @@ SUPPRESSIONS = $(top_srcdir)/common/gst.supp
 
 clean-local: clean-local-check
 
-check_PROGRAMS =				\
-	elements/tagid3v2mux
+
+if USE_TAGLIB
+check_taglib = elements/tagid3v2mux
+else
+check_taglib =
+endif
+
+check_PROGRAMS = $(check_taglib)
+
 TESTS = $(check_PROGRAMS)
 
 AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)