diff --git a/autobuild.sh b/autobuild.sh
index e31b9bf18..f93420e91 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -335,15 +335,17 @@ function build_doc() {
 
 function autobuild_test_suite() {
 	run_test "autobuild_check_format" ./scripts/check_format.sh
-	run_test "autobuild_external_code" $rootdir/test/external_code/test_make.sh $rootdir
 	run_test "autobuild_check_so_deps" $rootdir/test/make/check_so_deps.sh $1
-	./configure $config_params --without-shared
-	$MAKE $MAKEFLAGS
-	run_test "autobuild_generated_files_check" porcelain_check
-	run_test "autobuild_header_dependency_check" header_dependency_check
-	run_test "autobuild_make_install" $MAKE $MAKEFLAGS install DESTDIR="$SPDK_WORKSPACE" prefix=/usr
-	run_test "autobuild_make_uninstall" test_make_uninstall
-	run_test "autobuild_build_doc" build_doc
+	if [[ $SPDK_TEST_AUTOBUILD == 'full' ]]; then
+		run_test "autobuild_external_code" $rootdir/test/external_code/test_make.sh $rootdir
+		./configure $config_params --without-shared
+		$MAKE $MAKEFLAGS
+		run_test "autobuild_generated_files_check" porcelain_check
+		run_test "autobuild_header_dependency_check" header_dependency_check
+		run_test "autobuild_make_install" $MAKE $MAKEFLAGS install DESTDIR="$SPDK_WORKSPACE" prefix=/usr
+		run_test "autobuild_make_uninstall" test_make_uninstall
+		run_test "autobuild_build_doc" build_doc
+	fi
 }
 
 function unittest_build() {
@@ -363,12 +365,17 @@ if [ -n "$SPDK_TEST_NATIVE_DPDK" ]; then
 	run_test "build_native_dpdk" build_native_dpdk
 fi
 
-./configure $config_params
-echo "** START ** Info for Hostname: $HOSTNAME"
-uname -a
-$MAKE cc_version
-$MAKE cxx_version
-echo "** END ** Info for Hostname: $HOSTNAME"
+if [[ -z $SPDK_TEST_AUTOBUILD ]] || [[ $SPDK_TEST_AUTOBUILD == 'full' ]]; then
+	./configure $config_params
+	echo "** START ** Info for Hostname: $HOSTNAME"
+	uname -a
+	$MAKE cc_version
+	$MAKE cxx_version
+	echo "** END ** Info for Hostname: $HOSTNAME"
+elif [[ $SPDK_TEST_AUTOBUILD != 'tiny' ]]; then
+	echo "ERROR: supported values for SPDK_TEST_AUTOBUILD are 'full' and 'tiny'"
+	exit 1
+fi
 
 if [[ $SPDK_TEST_OCF -eq 1 ]]; then
 	run_test "autobuild_ocf_precompile" ocf_precompile
@@ -378,7 +385,7 @@ if [[ $SPDK_TEST_FUZZER -eq 1 ]]; then
 	run_test "autobuild_llvm_precompile" llvm_precompile
 fi
 
-if [[ $SPDK_TEST_AUTOBUILD -eq 1 ]]; then
+if [[ -n $SPDK_TEST_AUTOBUILD ]]; then
 	run_test "autobuild" autobuild_test_suite $1
 elif [[ $SPDK_TEST_UNITTEST -eq 1 ]]; then
 	run_test "unittest_build" unittest_build
diff --git a/autorun.sh b/autorun.sh
index 9b5207e1a..51d803190 100755
--- a/autorun.sh
+++ b/autorun.sh
@@ -22,4 +22,7 @@ $rootdir/autobuild.sh "$conf"
 if ((SPDK_TEST_UNITTEST == 1 || SPDK_RUN_FUNCTIONAL_TEST == 1)); then
 	sudo -E $rootdir/autotest.sh "$conf"
 fi
-$rootdir/autopackage.sh "$conf"
+
+if [[ $SPDK_TEST_AUTOBUILD != 'tiny' ]]; then
+	$rootdir/autopackage.sh "$conf"
+fi
diff --git a/scripts/vagrant/autorun-spdk.conf b/scripts/vagrant/autorun-spdk.conf
index 71078aea8..50bfe0a09 100644
--- a/scripts/vagrant/autorun-spdk.conf
+++ b/scripts/vagrant/autorun-spdk.conf
@@ -2,7 +2,7 @@
 SPDK_RUN_VALGRIND=1
 SPDK_RUN_FUNCTIONAL_TEST=1
 SPDK_TEST_UNITTEST=1
-SPDK_TEST_AUTOBUILD=1
+SPDK_TEST_AUTOBUILD="full"
 SPDK_TEST_ISAL=1
 SPDK_TEST_ISCSI=0
 SPDK_TEST_ISCSI_INITIATOR=0
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 70ade3d83..7765cdf6d 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -77,7 +77,7 @@ export SPDK_RUN_VALGRIND
 export SPDK_RUN_FUNCTIONAL_TEST
 : ${SPDK_TEST_UNITTEST=0}
 export SPDK_TEST_UNITTEST
-: ${SPDK_TEST_AUTOBUILD=0}
+: ${SPDK_TEST_AUTOBUILD=""}
 export SPDK_TEST_AUTOBUILD
 : ${SPDK_TEST_RELEASE_BUILD=0}
 export SPDK_TEST_RELEASE_BUILD
@@ -422,8 +422,8 @@ function get_config_params() {
 	fi
 
 	if [[ $SPDK_TEST_UNITTEST -eq 0 && \
-		$SPDK_TEST_SCANBUILD -eq 0 && \
-		$SPDK_TEST_AUTOBUILD -eq 0 ]]; then
+		$SPDK_TEST_SCANBUILD -eq 0 && -z \
+		$SPDK_TEST_AUTOBUILD ]]; then
 		config_params+=' --disable-unit-tests'
 	fi
 
diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git
index b88c31f97..c7c821788 100644
--- a/test/common/config/pkgdep/git
+++ b/test/common/config/pkgdep/git
@@ -101,7 +101,7 @@ function install_refspdk() {
 
 	cat > $HOME/autorun-spdk.conf <<- EOF
 		SPDK_BUILD_SHARED_OBJECT=1
-		SPDK_TEST_AUTOBUILD=1
+		SPDK_TEST_AUTOBUILD="full"
 		SPDK_TEST_UNITTEST=1
 		SPDK_TEST_BLOCKDEV=1
 		SPDK_TEST_PMDK=1
diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh
index 10b286443..43a4795d4 100755
--- a/test/common/config/vm_setup.sh
+++ b/test/common/config/vm_setup.sh
@@ -173,7 +173,7 @@ if [[ ! -e ~/autorun-spdk.conf ]]; then
 SPDK_RUN_VALGRIND=1
 SPDK_TEST_CRYPTO=1
 SPDK_RUN_FUNCTIONAL_TEST=1
-SPDK_TEST_AUTOBUILD=1
+SPDK_TEST_AUTOBUILD="full"
 SPDK_TEST_UNITTEST=1
 SPDK_TEST_ISCSI=1
 SPDK_TEST_ISCSI_INITIATOR=1
diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh
index 74aa29d08..18413e46d 100755
--- a/test/make/check_so_deps.sh
+++ b/test/make/check_so_deps.sh
@@ -287,7 +287,10 @@ if [ "$SPDK_TEST_OCF" -eq 1 ]; then
 	config_params="$config_params --with-ocf=$rootdir/ocf.a"
 fi
 
-$MAKE $MAKEFLAGS clean
+if [[ -f $rootdir/mk/spdk.common.mk ]]; then
+	$MAKE $MAKEFLAGS clean
+fi
+
 ./configure $config_params --with-shared
 # By setting SPDK_NO_LIB_DEPS=1, we ensure that we won't create any link dependencies.
 # Then we can be sure we get a valid accounting of the symbol dependencies we have.