diff --git a/autopackage.sh b/autopackage.sh
index 81cfd6ab7..1b8c726df 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 [[ $RUN_NIGHTLY -eq 0 && $SPDK_TEST_RELEASE_BUILD -eq 0 ]]; then
 	timing_finish
 	exit 0
 fi
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 14928f124..7bf154338 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -64,6 +64,8 @@ export SPDK_RUN_FUNCTIONAL_TEST
 export SPDK_TEST_UNITTEST
 : ${SPDK_TEST_AUTOBUILD=0}
 export SPDK_TEST_AUTOBUILD
+: ${SPDK_TEST_RELEASE_BUILD=0}
+export SPDK_TEST_RELEASE_BUILD
 : ${SPDK_TEST_ISAL=0}
 export SPDK_TEST_ISAL
 : ${SPDK_TEST_ISCSI=0}