diff --git a/autobuild.sh b/autobuild.sh
index bfb26440c..7521326b6 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -19,7 +19,9 @@ timing_enter autobuild
 ./configure $config_params
 
 timing_enter check_format
-./scripts/check_format.sh
+if [ $SPDK_RUN_CHECK_FORMAT -eq 1 ]; then
+	./scripts/check_format.sh
+fi
 timing_exit check_format
 
 timing_enter build_kmod
diff --git a/scripts/autotest_common.sh b/scripts/autotest_common.sh
index f9e17073a..14f5808d0 100755
--- a/scripts/autotest_common.sh
+++ b/scripts/autotest_common.sh
@@ -12,6 +12,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_CHECK_FORMAT=1}; export SPDK_RUN_CHECK_FORMAT
 : ${SPDK_RUN_SCANBUILD=1}; export SPDK_RUN_SCANBUILD
 : ${SPDK_RUN_VALGRIND=1}; export SPDK_RUN_VALGRIND
 : ${SPDK_TEST_UNITTEST=1}; export SPDK_TEST_UNITTEST