diff --git a/ChangeLog b/ChangeLog
index db8674286f..e621c0310e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-28  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* tests/check/Makefile.am:
+	Include local stuff before system installed things in LDFLAGS and
+	CFLAGS.
+
 2007-02-28  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ogg/gstoggdemux.c: (gst_ogg_demux_sink_activate):
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 7cf3193355..864ce7c3e0 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -196,13 +196,14 @@ elements_volume_CFLAGS = \
 	$(AM_CFLAGS)
 
 elements_vorbistag_LDADD = \
-	$(VORBIS_LIBS) \
-	$(LDADD)
+	$(LDADD) \
+	$(VORBIS_LIBS)
 
 elements_vorbistag_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(AM_CFLAGS) \
 	$(VORBIS_CFLAGS) \
-	$(CFLAGS) $(AM_CFLAGS)
+	$(CFLAGS)
 
 gst_typefindfunctions_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
 gst_typefindfunctions_LDADD = $(GST_BASE_LIBS) $(LDADD)