diff --git a/configure.ac b/configure.ac
index 3fb1e2cb..d0270b0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ AS_IF([test "x$enable_mu4e" != "xno"], [
   AS_IF([test "x$lispdir" != "xno"], [emacs_version="`$EMACS --version | head -1`"])
   AS_CASE([$emacs_version],[*23*|*24*|*25*],[build_mu4e=yes],
           [AC_WARN([emacs is too old to build mu4e (need emacs >= 23.x)])])
-])  	      
+])
 AM_CONDITIONAL(BUILD_MU4E, test "x$build_mu4e" = "xyes")
 
 # we need some special tricks for filesystems that don't have d_type;
@@ -316,6 +316,7 @@ mu4e/version.texi
 guile/Makefile
 guile/mu/Makefile
 guile/examples/Makefile
+guile/tests/Makefile
 toys/Makefile
 toys/mug/Makefile
 toys/mug2/Makefile
diff --git a/guile/Makefile.am b/guile/Makefile.am
index 90462e7b..3851db60 100644
--- a/guile/Makefile.am
+++ b/guile/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+## Copyright (C) 2011-2012 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ AM_CXXFLAGS=-Wall -Wextra -Wno-unused-parameter
 
 # note, we need top_builddir for snarfing with 'make distcheck' (ie.,
 # with separate builddir)
-SUBDIRS= . mu examples
+SUBDIRS= . mu examples tests
 INCLUDES=-I. -I${top_builddir} -I${top_srcdir}/lib ${GUILE_CFLAGS} ${GLIB_CFLAGS}
 
 # don't use -Werror, as it might break on other compilers