diff --git a/zcutil/afl/afl-build.sh b/zcutil/afl/afl-build.sh
index a055b7fae..759524c8c 100755
--- a/zcutil/afl/afl-build.sh
+++ b/zcutil/afl/afl-build.sh
@@ -7,7 +7,12 @@ CONFIGURE_FLAGS="--enable-tests=no --enable-fuzz-main"
 ZCUTIL=$(realpath "./zcutil")
 export AFL_LOG_DIR="$(pwd)"
 
-FUZZ_OPTIONS_STRING="Options are: CheckBlock, DecodeHexTx, DeserializeAddrMan, DeserializeTx or ReadFeeEstimates"
+for d in src/fuzzing/*/ ; do
+    fuzz_cases+="$(basename "$d"), "
+    fuzz_cases_choices=("${fuzz_cases_choices[@]}" $(basename "$d"))
+done
+
+FUZZ_OPTIONS_STRING="Options are: ${fuzz_cases::-2}"
 
 required_options_count=0
 DEFAULT_BUILD_CC="CC=$ZCUTIL/afl/zcash-wrapper-gcc"
@@ -17,6 +22,7 @@ function help {
     cat <<EOF
 A wrapper around ./zcutil/build.sh for instrumenting the build with AFL.
 You may obtain a copy of AFL using ./zcutil/afl/afl-get.sh.
+This script must be run from within the top level directory of a zcash clone.
 Additional arguments are passed-through to build.sh.
 
 Usage:
@@ -85,12 +91,10 @@ if ((required_options_count < 2)); then
     exit 1
 fi
 
-case $FUZZ_CASE in
-    CheckBlock|DecodeHexTx|DeserializeAddrMan|DeserializeTx|ReadFeeEstimates);;
-    *) echo "fuzz case option is invalid. ($FUZZ_OPTIONS_STRING)"
+if ! [[ "${fuzz_cases_choices[*]} " == *" $FUZZ_CASE "* ]]; then
+    echo "fuzz case option is invalid. ($FUZZ_OPTIONS_STRING)"
     exit 1
-    ;;
-esac
+fi
 
 cp "./src/fuzzing/$FUZZ_CASE/fuzz.cpp" src/fuzz.cpp
 
diff --git a/zcutil/afl/afl-get.sh b/zcutil/afl/afl-get.sh
index 69fcb50e6..97ff389d9 100755
--- a/zcutil/afl/afl-get.sh
+++ b/zcutil/afl/afl-get.sh
@@ -2,13 +2,18 @@
 
 set -eu -o pipefail
 
-FUZZ_OPTIONS_STRING="Where FUZZ_CASE is one of the following: CheckBlock, DecodeHexTx, DeserializeAddrMan, DeserializeTx or ReadFeeEstimates"
+for d in src/fuzzing/*/ ; do
+    fuzz_cases+="$(basename "$d"), "
+done
+
+FUZZ_OPTIONS_STRING="Where FUZZ_CASE is one of the following: ${fuzz_cases::-2}"
 
 required_options_count=0
 
 function help {
     cat <<EOF
 Obtains and builds a copy of AFL from source.
+This script must be run from within the top level directory of a zcash clone.
 
 Usage:
     $0 --afl-install=AFL_INSTALL_DIR
diff --git a/zcutil/afl/afl-getbuildrun.sh b/zcutil/afl/afl-getbuildrun.sh
index 9173e80f9..bad640609 100755
--- a/zcutil/afl/afl-getbuildrun.sh
+++ b/zcutil/afl/afl-getbuildrun.sh
@@ -2,7 +2,11 @@
 
 set -eu -o pipefail
 
-FUZZ_OPTIONS_STRING="Options are: CheckBlock, DecodeHexTx, DeserializeAddrMan, DeserializeTx or ReadFeeEstimates"
+for d in src/fuzzing/*/ ; do
+    fuzz_cases+="$(basename "$d"), "
+done
+
+FUZZ_OPTIONS_STRING="Options are: ${fuzz_cases::-2}"
 
 required_options_count=0
 
diff --git a/zcutil/afl/afl-run.sh b/zcutil/afl/afl-run.sh
index 80cc86430..6cbfffee3 100755
--- a/zcutil/afl/afl-run.sh
+++ b/zcutil/afl/afl-run.sh
@@ -2,13 +2,18 @@
 
 set -eu -o pipefail
 
-FUZZ_OPTIONS_STRING="Options are: CheckBlock, DecodeHexTx, DeserializeAddrMan, DeserializeTx or ReadFeeEstimates"
+for d in src/fuzzing/*/ ; do
+    fuzz_cases+="$(basename "$d"), "
+done
+
+FUZZ_OPTIONS_STRING="Options are: ${fuzz_cases::-2}"
 
 required_options_count=0
 
 function help {
     cat <<EOF
 Start fuzzing a case in a previously zcashd built for AFL.
+This script must be run from within the top level directory of a zcash clone.
 Additional arguments are passed-through to AFL.
 
 Usage: