diff --git a/autobuild.sh b/autobuild.sh
index c1ecf2dbe..fc6e1177f 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -65,7 +65,7 @@ fi
 
 
 timing_enter doxygen
-if hash doxygen; then
+if [ $SPDK_BUILD_DOC -eq 1 ] && hash doxygen; then
 	(cd "$rootdir"/doc; $MAKE $MAKEFLAGS) &> "$out"/doxygen.log
 	if hash pdflatex; then
 		(cd "$rootdir"/doc/output/latex && $MAKE $MAKEFLAGS) &>> "$out"/doxygen.log
diff --git a/scripts/autotest_common.sh b/scripts/autotest_common.sh
index 3269c9f10..543751707 100755
--- a/scripts/autotest_common.sh
+++ b/scripts/autotest_common.sh
@@ -10,6 +10,7 @@ if [[ ! -z $1 ]]; then
 fi
 
 # Set defaults for missing test config options
+: ${SPDK_BUILD_DOC=1}; export SPDK_BUILD_DOC
 : ${SPDK_TEST_ISCSI=1}; export SPDK_TEST_ISCSI
 : ${SPDK_TEST_NVME=1}; export SPDK_TEST_NVME
 : ${SPDK_TEST_NVMF=1}; export SPDK_TEST_NVMF