diff --git a/Makefile.am b/Makefile.am
index 19db0be..b18f673 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,9 @@ if BUILD_MSBCG729
 SUBDIRS += msbcg729 
 endif
 
+if RUN_TESTS
 SUBDIRS += test 
-
+endif
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libbcg729.pc
 
diff --git a/configure.ac b/configure.ac
index 18684bc..37ccde9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,10 @@ AC_ARG_ENABLE(strict,
 [wall_werror=$enableval],
 [wall_werror=yes]
 )
+# configure option to disable the tests
+AC_ARG_ENABLE([tests],
+	AS_HELP_STRING([--disable-tests], [Disable the tests]))
+	AM_CONDITIONAL([RUN_TESTS], [test "x$enable_tests" != "xno"])
 
 CFLAGS="$CFLAGS -Wall"