diff --git a/autobuild.sh b/autobuild.sh
index bffdb06e6..bfb26440c 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -23,7 +23,9 @@ timing_enter check_format
 timing_exit check_format
 
 timing_enter build_kmod
-./scripts/build_kmod.sh build
+if [ $SPDK_BUILD_IOAT_KMOD -eq 1 ]; then
+	./scripts/build_kmod.sh build
+fi
 timing_exit build_kmod
 
 scanbuild=''
diff --git a/scripts/autotest_common.sh b/scripts/autotest_common.sh
index a90cbb7e4..f9e17073a 100755
--- a/scripts/autotest_common.sh
+++ b/scripts/autotest_common.sh
@@ -11,6 +11,7 @@ fi
 
 # Set defaults for missing test config options
 : ${SPDK_BUILD_DOC=1}; export SPDK_BUILD_DOC
+: ${SPDK_BUILD_IOAT_KMOD=1}; export SPDK_BUILD_IOAT_KMOD
 : ${SPDK_RUN_SCANBUILD=1}; export SPDK_RUN_SCANBUILD
 : ${SPDK_RUN_VALGRIND=1}; export SPDK_RUN_VALGRIND
 : ${SPDK_TEST_UNITTEST=1}; export SPDK_TEST_UNITTEST