diff --git a/Makefile.am b/Makefile.am
index c637fa8e2d..8631a72aba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS=gst-libs gst sys ext examples tools ## testsuite
+SUBDIRS=gst-libs gst sys ext examples tools testsuite
 
-DIST_SUBDIRS=gst-libs gst sys ext examples tools ## testsuite
+DIST_SUBDIRS=gst-libs gst sys ext examples tools testsuite
 
 EXTRA_DIST=gst-plugins.spec depcomp AUTHORS COPYING README RELEASE ChangeLog autogen.sh
diff --git a/configure.ac b/configure.ac
index 30f1ef706c..e0ad6dbc8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,8 @@ AM_DISABLE_STATIC
 dnl when going to/from release please set the nano (fourth number) right !
 AS_VERSION(gst-plugins, GST_PLUGINS, 0, 3, 2, 1)
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
+dnl We disable static building for development, for time savings
+AM_DISABLE_STATIC
 AS_LIBTOOL(GST_PLUGINS, 0, 0, 0, yes)
 
 dnl FIXME take something else ?
@@ -797,6 +799,7 @@ gst-libs/gst/riff/Makefile
 examples/capsfilter/Makefile
 examples/Makefile
 tools/Makefile
+testsuite/autoplug/Makefile
 testsuite/Makefile
 )
 
diff --git a/tests/old/Makefile.am b/tests/old/Makefile.am
index 1a9b093fe9..5d26f1b22a 100644
--- a/tests/old/Makefile.am
+++ b/tests/old/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=
+SUBDIRS=autoplug
 DIST_SUBDIRS=autoplug
 
 GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd)
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 1a9b093fe9..5d26f1b22a 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=
+SUBDIRS=autoplug
 DIST_SUBDIRS=autoplug
 
 GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd)