diff --git a/tests/old/testsuite/threads/Makefile.am b/tests/old/testsuite/threads/Makefile.am
index 25ac44408c..2c42a6b0e8 100644
--- a/tests/old/testsuite/threads/Makefile.am
+++ b/tests/old/testsuite/threads/Makefile.am
@@ -8,15 +8,15 @@ check_PROGRAMS = $(testprogs)
 noinst_PROGRAMS = $(testsfailing)
 
 LDADD = $(GST_LIBS) 
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
 
 thread1_SOURCES = thread.c
-thread1_CFLAGS = -DTESTNUM=1
+thread1_CFLAGS = -DTESTNUM=1 $(AM_CFLAGS)
 thread2_SOURCES = thread.c
-thread2_CFLAGS = -DTESTNUM=2
+thread2_CFLAGS = -DTESTNUM=2 $(AM_CFLAGS)
 thread3_SOURCES = thread.c
-thread3_CFLAGS = -DTESTNUM=3
+thread3_CFLAGS = -DTESTNUM=3 $(AM_CFLAGS)
 thread4_SOURCES = thread.c
-thread4_CFLAGS = -DTESTNUM=4
+thread4_CFLAGS = -DTESTNUM=4 $(AM_CFLAGS)
 thread5_SOURCES = thread.c
-thread5_CFLAGS = -DTESTNUM=5
+thread5_CFLAGS = -DTESTNUM=5 $(AM_CFLAGS)
diff --git a/tests/old/testsuite/threads/threadd.c b/tests/old/testsuite/threads/threadd.c
index c28b4c02d7..c0902549f7 100644
--- a/tests/old/testsuite/threads/threadd.c
+++ b/tests/old/testsuite/threads/threadd.c
@@ -13,7 +13,7 @@ gboolean done = FALSE;
 static void
 construct_pipeline (GstElement *pipeline, gint identities) 
 {
-  GstElement *src, *sink, *identity;
+  GstElement *src, *sink, *identity = NULL;
   GstElement *from;
   int i;
 
diff --git a/tests/old/testsuite/threads/threade.c b/tests/old/testsuite/threads/threade.c
index e03db7df28..1fc4af8a6d 100644
--- a/tests/old/testsuite/threads/threade.c
+++ b/tests/old/testsuite/threads/threade.c
@@ -13,7 +13,7 @@ gboolean done = FALSE;
 static void
 construct_pipeline (GstElement *pipeline, gint identities)
 {
-  GstElement *src, *sink, *identity;
+  GstElement *src, *sink, *identity = NULL;
   GstElement *from;
   int i;
 
diff --git a/testsuite/threads/Makefile.am b/testsuite/threads/Makefile.am
index 25ac44408c..2c42a6b0e8 100644
--- a/testsuite/threads/Makefile.am
+++ b/testsuite/threads/Makefile.am
@@ -8,15 +8,15 @@ check_PROGRAMS = $(testprogs)
 noinst_PROGRAMS = $(testsfailing)
 
 LDADD = $(GST_LIBS) 
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
 
 thread1_SOURCES = thread.c
-thread1_CFLAGS = -DTESTNUM=1
+thread1_CFLAGS = -DTESTNUM=1 $(AM_CFLAGS)
 thread2_SOURCES = thread.c
-thread2_CFLAGS = -DTESTNUM=2
+thread2_CFLAGS = -DTESTNUM=2 $(AM_CFLAGS)
 thread3_SOURCES = thread.c
-thread3_CFLAGS = -DTESTNUM=3
+thread3_CFLAGS = -DTESTNUM=3 $(AM_CFLAGS)
 thread4_SOURCES = thread.c
-thread4_CFLAGS = -DTESTNUM=4
+thread4_CFLAGS = -DTESTNUM=4 $(AM_CFLAGS)
 thread5_SOURCES = thread.c
-thread5_CFLAGS = -DTESTNUM=5
+thread5_CFLAGS = -DTESTNUM=5 $(AM_CFLAGS)
diff --git a/testsuite/threads/threadd.c b/testsuite/threads/threadd.c
index c28b4c02d7..c0902549f7 100644
--- a/testsuite/threads/threadd.c
+++ b/testsuite/threads/threadd.c
@@ -13,7 +13,7 @@ gboolean done = FALSE;
 static void
 construct_pipeline (GstElement *pipeline, gint identities) 
 {
-  GstElement *src, *sink, *identity;
+  GstElement *src, *sink, *identity = NULL;
   GstElement *from;
   int i;
 
diff --git a/testsuite/threads/threade.c b/testsuite/threads/threade.c
index e03db7df28..1fc4af8a6d 100644
--- a/testsuite/threads/threade.c
+++ b/testsuite/threads/threade.c
@@ -13,7 +13,7 @@ gboolean done = FALSE;
 static void
 construct_pipeline (GstElement *pipeline, gint identities)
 {
-  GstElement *src, *sink, *identity;
+  GstElement *src, *sink, *identity = NULL;
   GstElement *from;
   int i;