diff --git a/autopackage.sh b/autopackage.sh
index 06ccb0687..0090985b3 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 [[ $SPDK_BUILD_PACKAGE -eq 0 && $RUN_NIGHTLY -eq 0 ]]; then
+if [[ $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 e6cd6f07a..28af51fd2 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -56,7 +56,6 @@ export RUN_NIGHTLY
 
 # Set defaults for missing test config options
 : ${SPDK_AUTOTEST_DEBUG_APPS:=0}; export SPDK_AUTOTEST_DEBUG_APPS
-: ${SPDK_BUILD_PACKAGE=0}; export SPDK_BUILD_PACKAGE
 : ${SPDK_RUN_VALGRIND=0}; export SPDK_RUN_VALGRIND
 : ${SPDK_RUN_FUNCTIONAL_TEST=0}; export SPDK_RUN_FUNCTIONAL_TEST
 : ${SPDK_TEST_UNITTEST=0}; export SPDK_TEST_UNITTEST