diff --git a/Makefile.am b/Makefile.am
index 5be9ee3ea8..02e416c91b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,6 @@
 include $(top_srcdir)/config/Makefile.options
 
 SUBDIRS = config include etc src 
-DIST_SUBDIRS = $(SUBDIRS) test
-
 EXTRA_DIST = README INSTALL VERSION Doxyfile
 
 dist-hook:
diff --git a/configure.ac b/configure.ac
index de6f948f73..d531749bc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1096,21 +1096,5 @@ AC_CONFIG_FILES([
     src/tools/ompid/Makefile
     src/tools/openmpi/Makefile
     src/tools/wrappers/Makefile
-
-    test/Makefile
-    test/include/Makefile
-    test/support/Makefile
-    test/class/Makefile
-    test/mca/Makefile
-    test/mca/oob/Makefile
-    test/mca/ns/Makefile
-    test/mca/gpr/Makefile
-    test/mca/llm/Makefile
-    test/mca/llm/base/Makefile
-    test/mca/pcm/Makefile
-    test/mca/pcm/base/Makefile
-    test/rte/Makefile
-    test/threads/Makefile
-    test/util/Makefile
 ])
 AC_OUTPUT