diff --git a/Makefile.am b/Makefile.am
index dbaaac632b..690f5e6376 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,11 @@ endif
 
 ### Tests (make check)
 
+if ENABLE_DOCS
 TESTS = tests/optionaltest tests/mantest tests/jqtest tests/onigtest tests/shtest tests/utf8test tests/base64test
+else
+TESTS = tests/optionaltest tests/jqtest tests/onigtest tests/shtest tests/utf8test tests/base64test
+endif
 TESTS_ENVIRONMENT = NO_VALGRIND=$(NO_VALGRIND)
 
 lib_LTLIBRARIES += somod.la
diff --git a/configure.ac b/configure.ac
index 4c1d46cabe..2388e6fb17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ if test "x$enable_all_static" != xyes; then
   AC_FIND_FUNC([dlopen], [dl], [#include <dlfcn.h>], [0, 0])
 fi
 
-AS_IF([test "x$enable_docs" != "xno"],[
+AS_IF([test "x$enable_docs" = "xyes"],[
    AC_CHECK_PROGS(pipenv_cmd, pipenv)
 
    AC_CACHE_CHECK([for Python dependencies], [jq_cv_python_deps],