diff --git a/autotest.sh b/autotest.sh
index 14e219c85..d92d06c43 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -342,6 +342,12 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then
 	if [[ $SPDK_TEST_SMA -eq 1 ]]; then
 		run_test "sma" ./test/sma/sma.sh
 	fi
+
+	if [[ $SPDK_TEST_FUZZER -eq 1 ]]; then
+		# TODO: Consider re-using test/fuzz directory for all fuzzing tests with proper
+		# structure, e.g.: test/fuzz/nvmf/*, test/fuzz/vfio/*, etc.
+		run_test "nvmf_llvm_fuzz" test/nvmf/target/llvm_nvme_fuzz.sh
+	fi
 fi
 
 timing_enter cleanup
diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh
index ba3018774..8c891ba7f 100755
--- a/test/nvmf/nvmf.sh
+++ b/test/nvmf/nvmf.sh
@@ -13,10 +13,6 @@ trap "exit 1" SIGINT SIGTERM EXIT
 
 TEST_ARGS=("$@")
 
-if [[ $SPDK_TEST_FUZZER -eq 1 ]]; then
-	run_test "nvmf_llvm_fuzz" test/nvmf/target/llvm_nvme_fuzz.sh "${TEST_ARGS[@]}"
-fi
-
 if [[ $SPDK_TEST_URING -eq 0 ]]; then
 	run_test "nvmf_example" test/nvmf/target/nvmf_example.sh "${TEST_ARGS[@]}"
 	run_test "nvmf_filesystem" test/nvmf/target/filesystem.sh "${TEST_ARGS[@]}"