diff --git a/autopackage.sh b/autopackage.sh
index eff16daaa..5428cb344 100755
--- a/autopackage.sh
+++ b/autopackage.sh
@@ -28,7 +28,7 @@ if [ $(git status --porcelain --ignore-submodules | wc -l) -ne 0 ]; then
 fi
 timing_exit porcelain_check
 
-if [ $RUN_NIGHTLY -eq 0 ]; then
+if [[ $SPDK_BUILD_PACKAGE -eq 0 && $RUN_NIGHTLY -eq 0 ]]; then
 	timing_finish
 	exit 0
 fi
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index e3afba6af..4a12d28d6 100644
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -28,6 +28,7 @@ export RUN_NIGHTLY_FAILING
 
 # Set defaults for missing test config options
 : ${SPDK_BUILD_DOC=0}; export SPDK_BUILD_DOC
+: ${SPDK_BUILD_PACKAGE=0}; export SPDK_BUILD_PACKAGE
 : ${SPDK_BUILD_SHARED_OBJECT=0}; export SPDK_BUILD_SHARED_OBJECT
 : ${SPDK_RUN_CHECK_FORMAT=0}; export SPDK_RUN_CHECK_FORMAT
 : ${SPDK_RUN_SCANBUILD=0}; export SPDK_RUN_SCANBUILD