diff --git a/configure.ac b/configure.ac
index 4b0a83516..498053c35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,16 @@ AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], ["$need_libgcrypt_version"],
 AM_PATH_LIBGCRYPT([$need_libgcrypt_version])
 
 
+# should expensive tests be run?
+AC_MSG_CHECKING(whether to run expensive tests)
+AC_ARG_ENABLE([expensivetests],
+   [AS_HELP_STRING([--enable-expensivetests], [enable running expensive testcases])],
+   [enable_expensive=${enableval}],
+   [enable_expensive=no])
+AC_MSG_RESULT($enable_expensive)
+AM_CONDITIONAL([HAVE_EXPENSIVE_TESTS], [test "x$enable_expensive" = "xyes"])
+
+
 if test "$wallet_only" != yes
 then
 
diff --git a/src/mint/Makefile.am b/src/mint/Makefile.am
index 68e6429ea..1c7e1ca87 100644
--- a/src/mint/Makefile.am
+++ b/src/mint/Makefile.am
@@ -36,7 +36,11 @@ taler_mint_httpd_SOURCES += \
 endif
 
 check_SCRIPTS = \
-  test_taler_mint_httpd.sh \
+  test_taler_mint_httpd.sh 
+
+if HAVE_EXPENSIVE_TESTS
+check_SCRIPTS += \
   test_taler_mint_httpd_afl.sh
+endif
 
 TESTS = $(check_SCRIPTS)