diff --git a/ChangeLog b/ChangeLog
index b2b93bbdf3..f98df8b1c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-25  Julien MOUTTE  <julien@moutte.net>
+
+	* tests/check/Makefile.am:
+	* tests/check/elements/cmmldec.c:
+	* tests/check/elements/cmmlenc.c: Fix tests so that they use
+	the plugins-base tags.
+
 2006-02-25  Julien MOUTTE  <julien@moutte.net>
 
 	* ext/Makefile.am: Re-enable module.
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 0ec81d7dfe..904dbccba4 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -34,3 +34,6 @@ LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
 VALGRIND_TESTS_DISABLE =
 
 SUPPRESSIONS = $(top_srcdir)/common/gst.supp
+
+elements_cmmldec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS)
+elements_cmmlenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS)
diff --git a/tests/check/elements/cmmldec.c b/tests/check/elements/cmmldec.c
index f2498d2238..67b896a83e 100644
--- a/tests/check/elements/cmmldec.c
+++ b/tests/check/elements/cmmldec.c
@@ -23,6 +23,8 @@
 
 #include <gst/check/gstcheck.h>
 
+#include <gst/tag/tag.h>
+
 #define SINK_CAPS "text/xml"
 #define SRC_CAPS "text/x-cmml"
 
diff --git a/tests/check/elements/cmmlenc.c b/tests/check/elements/cmmlenc.c
index da01984bd8..b6f532d18c 100644
--- a/tests/check/elements/cmmlenc.c
+++ b/tests/check/elements/cmmlenc.c
@@ -23,6 +23,8 @@
 
 #include <gst/check/gstcheck.h>
 
+#include <gst/tag/tag.h>
+
 #define SINK_CAPS "text/x-cmml"
 #define SRC_CAPS "text/xml"