diff --git a/Makefile.am b/Makefile.am
index 06309d33..dc02583b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+SUBDIRS = test
 AUTOMAKE_OPTIONS = dist-bzip2
 
 sysconf_DATA = bash_completion
diff --git a/configure.ac b/configure.ac
index 1aa08acf..7dbe3a83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.59])
 AC_INIT([bash-completion], [1.99])
-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-AC_CONFIG_FILES([Makefile])
+AM_INIT_AUTOMAKE([foreign dejagnu -Wall -Werror])
+AC_CONFIG_FILES([Makefile test/Makefile])
 AC_OUTPUT
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 00000000..e05abf5f
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,9 @@
+DEJATOOL = completion install unit
+AM_RUNTESTFLAGS = --outdir log
+
+EXTRA_DIST = completion \
+	     config \
+	     fixture1 \
+	     fixtures \
+	     lib \
+	     unit