diff --git a/tests/old/testsuite/plugin/Makefile.am b/tests/old/testsuite/plugin/Makefile.am
index cc5bd0b805..2f652d817c 100644
--- a/tests/old/testsuite/plugin/Makefile.am
+++ b/tests/old/testsuite/plugin/Makefile.am
@@ -5,7 +5,11 @@ testprogs = dynamic linked static # loading registry static2
 noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la
 
 libtestplugin_la_SOURCES = testplugin.c
+libtestplugin_la_CFLAGS = $(GST_CFLAGS)
+libtestplugin_la_LIBS = $(GST_LIBS)
 libtestplugin2_la_SOURCES = testplugin2.c
+libtestplugin2_la_CFLAGS = $(GST_CFLAGS)
+libtestplugin2_la_LIBS = $(GST_LIBS)
 
 # linked_LDFLAGS = -L. -ltestplugin -ltestplugin2
 
@@ -14,7 +18,3 @@ static_SOURCES = static.c testplugin_s.c testplugin2_s.c
 TESTS = $(testprogs)
 
 check_PROGRAMS = $(testprogs)
-
-# we have nothing but apps here, we can do this safely
-LIBS = $(GST_LIBS)
-CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
diff --git a/testsuite/plugin/Makefile.am b/testsuite/plugin/Makefile.am
index cc5bd0b805..2f652d817c 100644
--- a/testsuite/plugin/Makefile.am
+++ b/testsuite/plugin/Makefile.am
@@ -5,7 +5,11 @@ testprogs = dynamic linked static # loading registry static2
 noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la
 
 libtestplugin_la_SOURCES = testplugin.c
+libtestplugin_la_CFLAGS = $(GST_CFLAGS)
+libtestplugin_la_LIBS = $(GST_LIBS)
 libtestplugin2_la_SOURCES = testplugin2.c
+libtestplugin2_la_CFLAGS = $(GST_CFLAGS)
+libtestplugin2_la_LIBS = $(GST_LIBS)
 
 # linked_LDFLAGS = -L. -ltestplugin -ltestplugin2
 
@@ -14,7 +18,3 @@ static_SOURCES = static.c testplugin_s.c testplugin2_s.c
 TESTS = $(testprogs)
 
 check_PROGRAMS = $(testprogs)
-
-# we have nothing but apps here, we can do this safely
-LIBS = $(GST_LIBS)
-CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
diff --git a/win32/test b/win32/test
deleted file mode 100644
index e69de29bb2..0000000000