diff --git a/tests/bufspeed/Makefile.am b/tests/bufspeed/Makefile.am
index 5b2ebf4cbe..e42a756bc5 100644
--- a/tests/bufspeed/Makefile.am
+++ b/tests/bufspeed/Makefile.am
@@ -6,4 +6,4 @@ test1_SOURCES = test1.c $(top_srcdir)/gst/gstbuffer.c gstmempool.c
 EXTRA_DIST = gstbuffer.h gstmempool.h
 
 LDADD = $(GST_LIBS)
-CFLAGS = $(GST_CFLAGS) 
+AM_CFLAGS = $(GST_CFLAGS) 
diff --git a/tests/old/testsuite/Makefile.am b/tests/old/testsuite/Makefile.am
index 9965779ad9..bf1a1de7ba 100644
--- a/tests/old/testsuite/Makefile.am
+++ b/tests/old/testsuite/Makefile.am
@@ -18,7 +18,7 @@ check_PROGRAMS = $(testprogs)
 
 # we have nothing but apps here, we can do this safely
 LIBS = $(GST_LIBS)
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
 
 # we makes them, we gots to clean them
 CLEANFILES = test-registry.xml elementstest-registry.xml
diff --git a/tests/old/testsuite/clock/Makefile.am b/tests/old/testsuite/clock/Makefile.am
index 05d6f5e03b..a96fb65c08 100644
--- a/tests/old/testsuite/clock/Makefile.am
+++ b/tests/old/testsuite/clock/Makefile.am
@@ -8,5 +8,5 @@ TESTS = $(testprogs)
 check_PROGRAMS = $(testprogs)
 
 LDADD = $(GST_LIBS) 
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
 
diff --git a/tests/old/testsuite/elements/Makefile.am b/tests/old/testsuite/elements/Makefile.am
index 45d0fc5a8a..45f858ed3d 100644
--- a/tests/old/testsuite/elements/Makefile.am
+++ b/tests/old/testsuite/elements/Makefile.am
@@ -15,5 +15,5 @@ check_PROGRAMS = $(tests_failing) $(tests_working)
 
 EXTRA_DIST = property.h
 LDADD = $(GST_LIBS) 
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
 
diff --git a/tests/old/testsuite/refcounting/Makefile.am b/tests/old/testsuite/refcounting/Makefile.am
index e4024be96f..eafcdf45f8 100644
--- a/tests/old/testsuite/refcounting/Makefile.am
+++ b/tests/old/testsuite/refcounting/Makefile.am
@@ -24,5 +24,5 @@ noinst_HEADERS = mem.h
 
 # we have nothing but apps here, we can do this safely
 LIBS = $(GST_LIBS)
-CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
+AM_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
 
diff --git a/tests/old/testsuite/threads/Makefile.am b/tests/old/testsuite/threads/Makefile.am
index e148c2a09d..e261146ed4 100644
--- a/tests/old/testsuite/threads/Makefile.am
+++ b/tests/old/testsuite/threads/Makefile.am
@@ -5,7 +5,7 @@ TESTS = $(testprogs)
 check_PROGRAMS = $(testprogs)
 
 LDADD = $(GST_LIBS) 
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
 
 thread1_SOURCES = thread.c
 thread1_CFLAGS = -DTESTNUM=1
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 9965779ad9..bf1a1de7ba 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -18,7 +18,7 @@ check_PROGRAMS = $(testprogs)
 
 # we have nothing but apps here, we can do this safely
 LIBS = $(GST_LIBS)
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
 
 # we makes them, we gots to clean them
 CLEANFILES = test-registry.xml elementstest-registry.xml
diff --git a/testsuite/clock/Makefile.am b/testsuite/clock/Makefile.am
index 05d6f5e03b..a96fb65c08 100644
--- a/testsuite/clock/Makefile.am
+++ b/testsuite/clock/Makefile.am
@@ -8,5 +8,5 @@ TESTS = $(testprogs)
 check_PROGRAMS = $(testprogs)
 
 LDADD = $(GST_LIBS) 
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
 
diff --git a/testsuite/elements/Makefile.am b/testsuite/elements/Makefile.am
index 45d0fc5a8a..45f858ed3d 100644
--- a/testsuite/elements/Makefile.am
+++ b/testsuite/elements/Makefile.am
@@ -15,5 +15,5 @@ check_PROGRAMS = $(tests_failing) $(tests_working)
 
 EXTRA_DIST = property.h
 LDADD = $(GST_LIBS) 
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
 
diff --git a/testsuite/refcounting/Makefile.am b/testsuite/refcounting/Makefile.am
index e4024be96f..eafcdf45f8 100644
--- a/testsuite/refcounting/Makefile.am
+++ b/testsuite/refcounting/Makefile.am
@@ -24,5 +24,5 @@ noinst_HEADERS = mem.h
 
 # we have nothing but apps here, we can do this safely
 LIBS = $(GST_LIBS)
-CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
+AM_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
 
diff --git a/testsuite/threads/Makefile.am b/testsuite/threads/Makefile.am
index e148c2a09d..e261146ed4 100644
--- a/testsuite/threads/Makefile.am
+++ b/testsuite/threads/Makefile.am
@@ -5,7 +5,7 @@ TESTS = $(testprogs)
 check_PROGRAMS = $(testprogs)
 
 LDADD = $(GST_LIBS) 
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
 
 thread1_SOURCES = thread.c
 thread1_CFLAGS = -DTESTNUM=1