diff --git a/ChangeLog b/ChangeLog
index f8ef52054b..6577b1cab8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-13  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* tests/check/Makefile.am:
+	  Only run mpeg2enc unit test if we built the mpeg2enc plugin.
+
 2006-07-13  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* configure.ac:
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 3df83e7b99..d5d5ac470d 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -26,10 +26,16 @@ SUPPRESSIONS = $(top_srcdir)/common/gst.supp
 
 clean-local: clean-local-check
 
+if USE_MPEG2ENC
+check_mpeg2enc = elements/mpeg2enc
+else
+check_mpeg2enc =
+endif
+
 check_PROGRAMS = \
 	elements/gdppay \
 	elements/gdpdepay \
-	elements/mpeg2enc
+	$(check_mpeg2enc)
 
 TESTS = $(check_PROGRAMS)