diff --git a/Makefile.am b/Makefile.am
index 6449d6d..586e767 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=doc src include
+SUBDIRS=doc src include tests
 
 ACLOCAL_AMFLAGS=-I m4
 EXTRA_DIST=autogen.sh CMakeLists.txt
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..4c0765a
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,5 @@
+
+EXTRA_DIST=CMakeLists.txt $(wildcard $(srcdir)/*.py) autowrapper.sh
+
+TESTS_ENVIRONMENT=$(srcdir)/autowrapper.sh $(srcdir) $(top_builddir)
+TESTS=runtests.py
diff --git a/tests/autowrapper.sh b/tests/autowrapper.sh
new file mode 100755
index 0000000..634a03d
--- /dev/null
+++ b/tests/autowrapper.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+TESTSRC="$1"
+BUILD="$2"
+
+ARGS="${RUNTEST_ARGS}"
+
+exec "${TESTSRC}/runtests.py" --angel "${BUILD}/src/angel/lighttpd2" --worker "${BUILD}/src/main/lighttpd2-worker" --plugindir "${BUILD}/src/modules/.libs" $ARGS