diff --git a/autotest.sh b/autotest.sh
index ebccb19a7..48307019e 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -74,9 +74,11 @@ timing_exit rbd_setup
 # Unit Tests
 #####################
 
-timing_enter unittest
-valgrind="$valgrind" run_test ./unittest.sh
-timing_exit unittest
+if [ $SPDK_TEST_UNITTEST -eq 1 ]; then
+	timing_enter unittest
+	valgrind="$valgrind" run_test ./unittest.sh
+	timing_exit unittest
+fi
 
 timing_enter lib
 
diff --git a/scripts/autotest_common.sh b/scripts/autotest_common.sh
index 51a8d114d..adae38490 100755
--- a/scripts/autotest_common.sh
+++ b/scripts/autotest_common.sh
@@ -11,6 +11,7 @@ fi
 
 # Set defaults for missing test config options
 : ${SPDK_BUILD_DOC=1}; export SPDK_BUILD_DOC
+: ${SPDK_TEST_UNITTEST=1}; export SPDK_TEST_UNITTEST
 : ${SPDK_TEST_ISCSI=1}; export SPDK_TEST_ISCSI
 : ${SPDK_TEST_NVME=1}; export SPDK_TEST_NVME
 : ${SPDK_TEST_NVMF=1}; export SPDK_TEST_NVMF