diff --git a/configure.ac b/configure.ac
index 9871a65326..5c0ab93c04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -703,15 +703,15 @@ libs/gst/getbits/Makefile
 libs/gst/putbits/Makefile
 libs/gst/control/Makefile
 tests/Makefile
-tests/sched/Makefile
-tests/eos/Makefile
+tests/bufspeed/Makefile
+tests/memchunk/Makefile
 tests/muxing/Makefile
+tests/sched/Makefile
 testsuite/Makefile
 testsuite/bytestream/Makefile
 testsuite/capsnego/Makefile
 testsuite/plugin/Makefile
 testsuite/cleanup/Makefile
-tests/nego/Makefile
 examples/Makefile
 examples/autoplug/Makefile
 examples/helloworld/Makefile
diff --git a/examples/events/Makefile.am b/examples/events/Makefile.am
index 82d65e2f46..975ebab418 100644
--- a/examples/events/Makefile.am
+++ b/examples/events/Makefile.am
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = seek
 
-LIBS = $(GLIB_LIBS) $(GST_LIBS)
-CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
+LDADD = $(GST_LIBS)
+AM_CFLAGS = $(GST_CFLAGS)
diff --git a/tests/bufspeed/Makefile.am b/tests/bufspeed/Makefile.am
index e86b7a7699..7e0083063f 100644
--- a/tests/bufspeed/Makefile.am
+++ b/tests/bufspeed/Makefile.am
@@ -2,5 +2,5 @@ noinst_PROGRAMS = test1 test2
 
 test1_SOURCES = test1.c gstbuffer.c gstmempool.c
 
-#LIBS += $(GST_LIBS)
-CFLAGS += $(GST_CFLAGS) 
+LDADD = $(GST_LIBS)
+AM_CFLAGS = $(GST_CFLAGS) 
diff --git a/tests/bufspeed/test1.c b/tests/bufspeed/test1.c
index 951af46067..7bedae68d8 100644
--- a/tests/bufspeed/test1.c
+++ b/tests/bufspeed/test1.c
@@ -6,9 +6,7 @@ main (int argc, char *argv[])
   GstBuffer *buf;
   guint i;
   
-  g_thread_init (NULL);
-  gtk_init (&argc, &argv);
-  _gst_buffer_initialize ();
+  gst_init (&argc, &argv);
 
   for (i=0; i<5000000; i++) {
     buf = gst_buffer_new ();
diff --git a/tests/bufspeed/test2.c b/tests/bufspeed/test2.c
index 616ad1f554..270ea9a1bf 100644
--- a/tests/bufspeed/test2.c
+++ b/tests/bufspeed/test2.c
@@ -6,9 +6,7 @@ main (int argc, char *argv[])
   GstBuffer *buf;
   guint i;
   
-  g_thread_init (NULL);
-  gtk_init (&argc, &argv);
-  _gst_buffer_initialize ();
+  gst_init (&argc, &argv);
 
   for (i=0; i<5000000; i++) {
     buf = gst_buffer_new ();
diff --git a/tests/memchunk/Makefile.am b/tests/memchunk/Makefile.am
index fdc2c40925..fbb20287f7 100644
--- a/tests/memchunk/Makefile.am
+++ b/tests/memchunk/Makefile.am
@@ -3,5 +3,5 @@ noinst_PROGRAMS = gmemchunktest gstmemchunktest
 gmemchunktest_SOURCES = gmemchunktest.c
 gstmemchunktest_SOURCES = gstmemchunktest.c gstmemchunk.c gstmemchunk.h
 
-LIBS = $(GST_LIBS)
-CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
+LDADD = $(GST_LIBS)
+AM_CFLAGS = $(GST_CFLAGS)
diff --git a/tests/old/examples/events/Makefile.am b/tests/old/examples/events/Makefile.am
index 82d65e2f46..975ebab418 100644
--- a/tests/old/examples/events/Makefile.am
+++ b/tests/old/examples/events/Makefile.am
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = seek
 
-LIBS = $(GLIB_LIBS) $(GST_LIBS)
-CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
+LDADD = $(GST_LIBS)
+AM_CFLAGS = $(GST_CFLAGS)