diff --git a/configure.in b/configure.in
index 1154196..abf7bf4 100644
--- a/configure.in
+++ b/configure.in
@@ -31,11 +31,15 @@
 AM_CONFIG_HEADER(config.h)
 
 AC_ARG_ENABLE(talloc,
-	[  --disable-talloc Support message buffer ],
+	[  --disable-talloc Disable building talloc memory allocator ],
 	[enable_talloc=0], [enable_talloc=1])
-
 AM_CONDITIONAL(ENABLE_TALLOC, test "x$enable_talloc" = "x1")
 
+AC_ARG_ENABLE(tests,
+	[  --disable-tests Disable building test programs ],
+	[enable_tests=0], [enable_tests=1])
+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "x1")
+
 AC_OUTPUT(
 	libosmocore.pc
 	include/osmocore/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 56e8b6f..0119a02 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1 +1,3 @@
+if ENABLE_TESTS
 SUBDIRS = timer sms
+endif