diff --git a/Makefile.am b/Makefile.am
index 396eee4b10..e92d35026e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS = config include src
+SUBDIRS = config include src test
 
 EXTRA_DIST = README INSTALL VERSION Doxyfile
 
diff --git a/configure.ac b/configure.ac
index f462f1ce78..7aff3d19ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -828,5 +828,11 @@ AC_CONFIG_FILES([
     src/tools/mpirun/Makefile
     src/tools/wrappers/Makefile
 
+    test/Makefile
+    test/support/Makefile
+    test/lfc/Makefile
+    test/threads/Makefile
+    test/util/Makefile
+
 ])
 AC_OUTPUT