diff --git a/Makefile.am b/Makefile.am
index 7fd9c23..95a16ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,5 +9,3 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libevdev.pc
 
 EXTRA_DIST = libevdev.pc.in
-
-AM_DISTCHECK_CONFIGURE_FLAGS = --disable-test-run
diff --git a/configure.ac b/configure.ac
index 5ed6e6f..0f5984a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,11 +79,6 @@ AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"])
 AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x$HAVE_CHECK" = "xyes"])
 AM_CONDITIONAL(ENABLE_STATIC_LINK_TEST, [test "x$enable_static" = "xyes"])
 
-AC_ARG_ENABLE([test-run],
-	       AS_HELP_STRING([--enable-test-run], [For internal use only]),
-	       [run_tests="$enableval"], [run_tests="yes"])
-AM_CONDITIONAL(RUN_TESTS, [test "x$run_tests" = "xyes"])
-
 with_cflags=""
 if test "x$GCC" = "xyes"; then
 	CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
@@ -168,7 +163,6 @@ AC_MSG_RESULT([
 
 	       Build documentation		${have_doxygen}
 	       Enable unit-tests		${HAVE_CHECK}
-	       Run unit-tests			${run_tests}
 	       Enable profiling			${enable_gcov}
 	       Static library symbol check	${static_symbol_leaks_test}
 	       ])
diff --git a/test/Makefile.am b/test/Makefile.am
index b3c0c62..242f407 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -36,9 +36,7 @@ run_tests = \
 
 noinst_PROGRAMS += $(run_tests)
 
-if RUN_TESTS
 TESTS = $(run_tests)
-endif
 
 common_sources = \
 		 test-common-uinput.c \