diff --git a/tests/old/testsuite/Makefile.am b/tests/old/testsuite/Makefile.am
index d63dfeccef..1740ddd60a 100644
--- a/tests/old/testsuite/Makefile.am
+++ b/tests/old/testsuite/Makefile.am
@@ -1,5 +1,5 @@
-# FIXME : refcounting threads bytestream cleanup
-SUBDIRS = . caps plugin elements clock ## dynparams
+# FIXME : refcounting threads bytestream
+SUBDIRS = caps cleanup plugin elements clock refcounting ## dynparams
 
 GST_PLUGIN_PATH = $(shell cd $(top_builddir) && pwd)
 TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`/test-registry.xml
@@ -15,6 +15,7 @@ LIBS = $(GST_LIBS)
 CFLAGS = $(GST_CFLAGS)
 
 # FIXME : refcounting threadds
-DIST_SUBDIRS = caps plugin bytestream cleanup elements dynparams clock
+DIST_SUBDIRS = bytestream caps cleanup clock dynparams elements \
+		plugin refcounting
 
 EXTRA_DIST = gst-inspect-check
diff --git a/tests/old/testsuite/caps/Makefile.am b/tests/old/testsuite/caps/Makefile.am
index fcb4db64d8..d52c90ea45 100644
--- a/tests/old/testsuite/caps/Makefile.am
+++ b/tests/old/testsuite/caps/Makefile.am
@@ -7,7 +7,6 @@ TESTS = $(testprogs)
 
 check_PROGRAMS = $(testprogs)
 
-# we have nothing but apps here, we can do this safely
 intersection_LDADD = $(GST_LIBS) 
 intersection_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS) $(XML_CFLAGS)
 compatibility_LDADD = $(GST_LIBS) 
diff --git a/tests/old/testsuite/elements/Makefile.am b/tests/old/testsuite/elements/Makefile.am
index 15d4b1b8fa..38b9f61ee6 100644
--- a/tests/old/testsuite/elements/Makefile.am
+++ b/tests/old/testsuite/elements/Makefile.am
@@ -1,9 +1,9 @@
 if BUILD_FAILING_TESTS
-tests_failing = tee
+tests_failing = 
 else
 tests_failing =
 endif
-tests_working = fake name
+tests_working = fake name tee
 
 ## GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd)
 
diff --git a/tests/old/testsuite/elements/tee.c b/tests/old/testsuite/elements/tee.c
index f250e75b0a..d9f2b33cc6 100644
--- a/tests/old/testsuite/elements/tee.c
+++ b/tests/old/testsuite/elements/tee.c
@@ -46,6 +46,7 @@ main (int argc, char *argv[])
   GstCaps *src_caps = NULL;
   GstCaps *sink_caps = NULL;
   GstProps *props = NULL;
+  GstPad *pad = NULL;
 
   /* init */
   gst_init (&argc, &argv);
@@ -107,7 +108,8 @@ main (int argc, char *argv[])
 	);
   g_assert (src_caps != NULL);
   g_print ("Setting caps on fakesrc's src pad\n");
-  if (! (gst_pad_try_set_caps (gst_element_get_pad (src, "src"), src_caps)))
+  pad = gst_element_get_pad (src, "src");
+  if (! (gst_pad_try_set_caps (pad, src_caps)))
   {
     g_print ("Could not set caps !\n");
   }
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index d63dfeccef..1740ddd60a 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,5 +1,5 @@
-# FIXME : refcounting threads bytestream cleanup
-SUBDIRS = . caps plugin elements clock ## dynparams
+# FIXME : refcounting threads bytestream
+SUBDIRS = caps cleanup plugin elements clock refcounting ## dynparams
 
 GST_PLUGIN_PATH = $(shell cd $(top_builddir) && pwd)
 TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`/test-registry.xml
@@ -15,6 +15,7 @@ LIBS = $(GST_LIBS)
 CFLAGS = $(GST_CFLAGS)
 
 # FIXME : refcounting threadds
-DIST_SUBDIRS = caps plugin bytestream cleanup elements dynparams clock
+DIST_SUBDIRS = bytestream caps cleanup clock dynparams elements \
+		plugin refcounting
 
 EXTRA_DIST = gst-inspect-check
diff --git a/testsuite/caps/Makefile.am b/testsuite/caps/Makefile.am
index fcb4db64d8..d52c90ea45 100644
--- a/testsuite/caps/Makefile.am
+++ b/testsuite/caps/Makefile.am
@@ -7,7 +7,6 @@ TESTS = $(testprogs)
 
 check_PROGRAMS = $(testprogs)
 
-# we have nothing but apps here, we can do this safely
 intersection_LDADD = $(GST_LIBS) 
 intersection_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS) $(XML_CFLAGS)
 compatibility_LDADD = $(GST_LIBS) 
diff --git a/testsuite/elements/Makefile.am b/testsuite/elements/Makefile.am
index 15d4b1b8fa..38b9f61ee6 100644
--- a/testsuite/elements/Makefile.am
+++ b/testsuite/elements/Makefile.am
@@ -1,9 +1,9 @@
 if BUILD_FAILING_TESTS
-tests_failing = tee
+tests_failing = 
 else
 tests_failing =
 endif
-tests_working = fake name
+tests_working = fake name tee
 
 ## GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd)
 
diff --git a/testsuite/elements/tee.c b/testsuite/elements/tee.c
index f250e75b0a..d9f2b33cc6 100644
--- a/testsuite/elements/tee.c
+++ b/testsuite/elements/tee.c
@@ -46,6 +46,7 @@ main (int argc, char *argv[])
   GstCaps *src_caps = NULL;
   GstCaps *sink_caps = NULL;
   GstProps *props = NULL;
+  GstPad *pad = NULL;
 
   /* init */
   gst_init (&argc, &argv);
@@ -107,7 +108,8 @@ main (int argc, char *argv[])
 	);
   g_assert (src_caps != NULL);
   g_print ("Setting caps on fakesrc's src pad\n");
-  if (! (gst_pad_try_set_caps (gst_element_get_pad (src, "src"), src_caps)))
+  pad = gst_element_get_pad (src, "src");
+  if (! (gst_pad_try_set_caps (pad, src_caps)))
   {
     g_print ("Could not set caps !\n");
   }