diff --git a/configure.ac b/configure.ac
index 943e2e3..51c25c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,12 +134,6 @@ AC_ARG_ENABLE([server],
   [build_server="yes"])
 AM_CONDITIONAL([BUILD_SERVER], [test x"$build_server" != xno])
 
-AC_ARG_ENABLE([tests],
-  [AS_HELP_STRING([--enable-tests], [Build tests @<:@no@:>@])],
-  [build_tests="$enableval"],
-  [build_tests="no"])
-AM_CONDITIONAL([BUILD_TESTS], [test x"$build_tests" != xno])
-
 AC_ARG_ENABLE([examples],
   [AS_HELP_STRING([--enable-examples], [Build the miscellaneous programs in src/examples @<:@no@:>@])],
   [build_examples="$enableval"],
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 825ca9c..b2bbfc8 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,9 +1,8 @@
 AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
 AM_LDFLAGS  = $(HARDEN_LDFLAGS)
 
-if BUILD_TESTS
-  noinst_PROGRAMS = ocb-aes encrypt-decrypt
-endif
+check_PROGRAMS = ocb-aes encrypt-decrypt
+TESTS = ocb-aes encrypt-decrypt
 
 ocb_aes_SOURCES = ocb-aes.cc test_utils.cc test_utils.h
 ocb_aes_CPPFLAGS = -I$(srcdir)/../crypto -I$(srcdir)/../util