diff --git a/Makefile.am b/Makefile.am
index aba57bd066..71232c0258 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,5 +6,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 
 EXTRA_DIST = curl.spec curl-ssl.spec
 
-SUBDIRS = docs lib src include
+SUBDIRS = docs lib src include tests
 
+test:
+	@(cd tests; make test)
diff --git a/configure.in b/configure.in
index 7a2f10a4e5..1a5948b00c 100644
--- a/configure.in
+++ b/configure.in
@@ -611,7 +611,8 @@ AC_OUTPUT( Makefile \
 	   include/Makefile \
 	   include/curl/Makefile \
 	   src/Makefile \
-           lib/Makefile )
+           lib/Makefile \
+           tests/Makefile)
 dnl	   perl/checklinks.pl \
 dnl	   perl/getlinks.pl \
 dnl        perl/formfind.pl \