diff --git a/Makefile.am b/Makefile.am
index 7428c15d61f94ae4fe56637bc12087c418d6e215..70624560cb1f067cbf19b047413f1e7fa9c055c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,20 @@
 SUBDIRS = bin conf lib resources templates
 
-EXTRA_DIST = LICENSE.txt README.md
+AM_TESTS_ENVIRONMENT = PERL5LIB='$(srcdir)/lib'; export PERL5LIB;
+TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+                  $(top_srcdir)/build-aux/tap-driver.sh
+
+TESTS = \
+	t/01compile.t \
+	t/02critic.t \
+	t/account-manager.cgi.t \
+	t/account-manager.t \
+	t/metadata.t \
+	t/tools.t
+
+EXTRA_DIST = \
+	LICENSE.txt \
+	README.md \
+	t/edugain.xml \
+	t/manager.conf \
+	$(TESTS)
diff --git a/configure.ac b/configure.ac
index 1b3f350ddd30d7ff9e396e0ee7aa6eb7e200057f..5cc705d36f806d4d79cfe0b932c13f8660bc74f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 AC_PREREQ(2.59)
 AC_INIT([Account Manager], 0.1)
 AM_INIT_AUTOMAKE([foreign])
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
 
 wwwdir=$datadir/account-manager/www
 modulesdir=$datadir/account-manager/lib