diff --git a/autobuild.sh b/autobuild.sh
index c7b369698..b2c71ae2a 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -58,9 +58,8 @@ function scanbuild_make {
 	pass=true
 	$scanbuild $MAKE $MAKEFLAGS > $out/build_output.txt && rm -rf $out/scan-build-tmp || make_fail_cleanup
 	xtrace_disable
-	for ent in $(find app examples lib module -type f | grep -vF ".h"); do
+	for ent in $(find app examples lib module test -type f | grep -vF ".h"); do
 		if [[ $ent == lib/env_ocf* ]]; then continue; fi
-		if [[ SPDK_RUN_FUNCTIONAL_TEST -eq 0 && $ent == examples* ]]; then continue; fi
 		if file -bi $ent | grep -q 'text/x-c'; then
 			echo $ent | sed 's/\.cp\{0,2\}$//g' >> $out/all_c_files.txt
 		fi
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 81b22115d..e6cd6f07a 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -197,11 +197,6 @@ if [ -d /usr/include/iscsi ]; then
 	fi
 fi
 
-if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 0 ]; then
-	config_params+=' --disable-tests'
-	config_params+=' --disable-examples'
-fi
-
 if [ $SPDK_TEST_UNITTEST -eq 0 ]; then
 	config_params+=' --disable-unit-tests'
 fi
diff --git a/test/common/skipped_build_files.txt b/test/common/skipped_build_files.txt
index 8b25ea247..c9c237129 100644
--- a/test/common/skipped_build_files.txt
+++ b/test/common/skipped_build_files.txt
@@ -10,6 +10,8 @@ lib/rocksdb/env_spdk.cc
 # Not configured to test FC
 lib/nvmf/fc
 lib/nvmf/fc_ls
+test/unit/lib/nvmf/fc.c/fc_ut
+test/unit/lib/nvmf/fc_ls.c/fc_ls_ut
 
 # Not configured for Neon testing
 lib/util/base64_neon
@@ -33,3 +35,16 @@ module/sock/uring/uring
 
 # Currently not testing blobfs_fuse, enable when ready.
 module/blobfs/bdev/blobfs_fuse
+test/blobfs/fuse/fuse
+
+
+# These files all represent c files that are only compiled by direct inclusion in other files.
+test/common/lib/test_env
+test/common/lib/test_sock
+test/common/lib/ut_multithread
+test/unit/lib/blob/bs_dev_common
+test/unit/lib/blob/bs_scheduler
+test/unit/lib/ftl/common/utils
+test/unit/lib/iscsi/common
+test/unit/lib/json_mock
+test/unit/lib/sock/uring.c/uring_ut