diff --git a/ChangeLog b/ChangeLog
index 70b4259b32..29469a96fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-16  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* tests/check/Makefile.am:
+	  Don't try to run annodex unit tests if the annodex
+	  plugin has not been built (Fixes #351116).
+
 2006-08-16  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/autodetect/gstautoaudiosink.c:
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 057ce1676d..a1f6fd9ee8 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -15,6 +15,14 @@ CLEANFILES = core.* test-registry.xml
 
 clean-local: clean-local-check
 
+if USE_ANNODEX
+check_annodex = \
+	elements/cmmldec \
+	elements/cmmlenc
+else
+check_annodex = 
+endif
+
 if USE_TAGLIB
 check_taglib = \
 	elements/id3v2mux \
@@ -24,11 +32,10 @@ check_taglib =
 endif
 
 check_PROGRAMS = \
+	$(check_annodex) \
 	elements/avimux \
 	elements/level \
 	elements/matroskamux \
-	elements/cmmldec \
-	elements/cmmlenc \
 	elements/icydemux \
 	$(check_taglib)