diff --git a/configure.ac b/configure.ac
index cd7db377b7ef617e2cd445835b49687f2ef034ae..4f4dd9812f2f04580cb87d618d8c7fa4203f24a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,6 +240,7 @@ AC_CONFIG_FILES([Makefile
 		 doc/Makefile
 		 doc/man/Makefile
 		 testsuite/Makefile
+		 testsuite/expect/Makefile
 		 testsuite/slurm_unit/Makefile
 		 testsuite/slurm_unit/common/Makefile
 		 testsuite/slurm_unit/slurmctld/Makefile
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 9e7362b13c9a3e37034d429fec7fd209f2593bd8..c8d068f8adb03f7c281f5566db443ea7856121ee 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = dejagnu
 #RUNTESTDEFAULTFLAGS = --srcdir $$srcdir/testsuite
 
-SUBDIRS = slurm_unit
+SUBDIRS = expect slurm_unit
 
 noinst_HEADERS = dejagnu.h
 
diff --git a/testsuite/expect/Makefile.am b/testsuite/expect/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..82be37ae44fa2979f2d9debbfe16e80b4292ff45
--- /dev/null
+++ b/testsuite/expect/Makefile.am
@@ -0,0 +1,6 @@
+# $Id: Makefile.am 5331 2005-09-07 21:39:04Z morrone $
+
+AUTOMAKE_OPTIONS = foreign
+
+distclean-local:
+	rm -rf *error *output