diff --git a/Makefile.am b/Makefile.am
index 12442b8..34de37a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS = src . tests
+if COND_WANT_TESTS
+  MAYBE_TESTS = tests
+endif
+SUBDIRS = src . $(MAYBE_TESTS)
 
 dist_man_MANS = bip.1 bip.conf.5 bipmkpw.1
 
diff --git a/configure.ac b/configure.ac
index 27fe857..4409745 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ PKG_CHECK_MODULES([CHECK], [check >= 0.9.6], [
 		   AC_CONFIG_FILES([tests/Makefile])
 		   enable_tests=yes
 		   ], [ enable_tests=no ])
+AM_CONDITIONAL([COND_WANT_TESTS], [test "$enable_tests" = yes])
 
 AC_CHECK_FUNC(backtrace_symbols_fd, [
         AC_DEFINE(HAVE_BACKTRACE, [], [Use glibc backtrace on fatal()])