diff --git a/test/fuzz-corpus/.gitattributes b/test/fuzz/.gitattributes
similarity index 100%
rename from test/fuzz-corpus/.gitattributes
rename to test/fuzz/.gitattributes
diff --git a/test/fuzz-corpus/dhcp-server/discover-existing b/test/fuzz/fuzz-dhcp-server/discover-existing
similarity index 100%
rename from test/fuzz-corpus/dhcp-server/discover-existing
rename to test/fuzz/fuzz-dhcp-server/discover-existing
diff --git a/test/fuzz-corpus/dhcp-server/discover-new b/test/fuzz/fuzz-dhcp-server/discover-new
similarity index 100%
rename from test/fuzz-corpus/dhcp-server/discover-new
rename to test/fuzz/fuzz-dhcp-server/discover-new
diff --git a/test/fuzz-corpus/dhcp-server/release b/test/fuzz/fuzz-dhcp-server/release
similarity index 100%
rename from test/fuzz-corpus/dhcp-server/release
rename to test/fuzz/fuzz-dhcp-server/release
diff --git a/test/fuzz-corpus/dhcp-server/request-existing b/test/fuzz/fuzz-dhcp-server/request-existing
similarity index 100%
rename from test/fuzz-corpus/dhcp-server/request-existing
rename to test/fuzz/fuzz-dhcp-server/request-existing
diff --git a/test/fuzz-corpus/dhcp-server/request-new b/test/fuzz/fuzz-dhcp-server/request-new
similarity index 100%
rename from test/fuzz-corpus/dhcp-server/request-new
rename to test/fuzz/fuzz-dhcp-server/request-new
diff --git a/test/fuzz-corpus/dhcp-server/request-reboot b/test/fuzz/fuzz-dhcp-server/request-reboot
similarity index 100%
rename from test/fuzz-corpus/dhcp-server/request-reboot
rename to test/fuzz/fuzz-dhcp-server/request-reboot
diff --git a/test/fuzz-corpus/dhcp-server/request-renew b/test/fuzz/fuzz-dhcp-server/request-renew
similarity index 100%
rename from test/fuzz-corpus/dhcp-server/request-renew
rename to test/fuzz/fuzz-dhcp-server/request-renew
diff --git a/test/fuzz-corpus/journal-remote/invalid-ts.txt b/test/fuzz/fuzz-journal-remote/invalid-ts.txt
similarity index 100%
rename from test/fuzz-corpus/journal-remote/invalid-ts.txt
rename to test/fuzz/fuzz-journal-remote/invalid-ts.txt
diff --git a/test/fuzz-corpus/journal-remote/sample.txt b/test/fuzz/fuzz-journal-remote/sample.txt
similarity index 100%
rename from test/fuzz-corpus/journal-remote/sample.txt
rename to test/fuzz/fuzz-journal-remote/sample.txt
diff --git "a/test/fuzz-corpus/unit-file/dev-mapper-fedora_krowka\\x2dswap.swap" "b/test/fuzz/fuzz-unit-file/dev-mapper-fedora_krowka\\x2dswap.swap"
similarity index 100%
rename from "test/fuzz-corpus/unit-file/dev-mapper-fedora_krowka\\x2dswap.swap"
rename to "test/fuzz/fuzz-unit-file/dev-mapper-fedora_krowka\\x2dswap.swap"
diff --git a/test/fuzz-corpus/unit-file/directives.service b/test/fuzz/fuzz-unit-file/directives.service
similarity index 100%
rename from test/fuzz-corpus/unit-file/directives.service
rename to test/fuzz/fuzz-unit-file/directives.service
diff --git a/test/fuzz-corpus/unit-file/empty.scope b/test/fuzz/fuzz-unit-file/empty.scope
similarity index 100%
rename from test/fuzz-corpus/unit-file/empty.scope
rename to test/fuzz/fuzz-unit-file/empty.scope
diff --git a/test/fuzz-corpus/unit-file/machine.slice b/test/fuzz/fuzz-unit-file/machine.slice
similarity index 100%
rename from test/fuzz-corpus/unit-file/machine.slice
rename to test/fuzz/fuzz-unit-file/machine.slice
diff --git a/test/fuzz-corpus/unit-file/proc-sys-fs-binfmt_misc.automount b/test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount
similarity index 100%
rename from test/fuzz-corpus/unit-file/proc-sys-fs-binfmt_misc.automount
rename to test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount
diff --git a/test/fuzz-corpus/unit-file/syslog.socket b/test/fuzz/fuzz-unit-file/syslog.socket
similarity index 100%
rename from test/fuzz-corpus/unit-file/syslog.socket
rename to test/fuzz/fuzz-unit-file/syslog.socket
diff --git a/test/fuzz-corpus/unit-file/systemd-ask-password-console.path b/test/fuzz/fuzz-unit-file/systemd-ask-password-console.path
similarity index 100%
rename from test/fuzz-corpus/unit-file/systemd-ask-password-console.path
rename to test/fuzz/fuzz-unit-file/systemd-ask-password-console.path
diff --git a/test/fuzz-corpus/unit-file/systemd-machined.service b/test/fuzz/fuzz-unit-file/systemd-machined.service
similarity index 100%
rename from test/fuzz-corpus/unit-file/systemd-machined.service
rename to test/fuzz/fuzz-unit-file/systemd-machined.service
diff --git a/test/fuzz-corpus/unit-file/systemd-resolved.service b/test/fuzz/fuzz-unit-file/systemd-resolved.service
similarity index 100%
rename from test/fuzz-corpus/unit-file/systemd-resolved.service
rename to test/fuzz/fuzz-unit-file/systemd-resolved.service
diff --git a/test/fuzz-corpus/unit-file/systemd-tmpfiles-clean.timer b/test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer
similarity index 100%
rename from test/fuzz-corpus/unit-file/systemd-tmpfiles-clean.timer
rename to test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer
diff --git a/test/fuzz-corpus/unit-file/timers.target b/test/fuzz/fuzz-unit-file/timers.target
similarity index 100%
rename from test/fuzz-corpus/unit-file/timers.target
rename to test/fuzz/fuzz-unit-file/timers.target
diff --git a/test/fuzz-corpus/unit-file/var-lib-machines.mount b/test/fuzz/fuzz-unit-file/var-lib-machines.mount
similarity index 100%
rename from test/fuzz-corpus/unit-file/var-lib-machines.mount
rename to test/fuzz/fuzz-unit-file/var-lib-machines.mount
diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh
index 2db5b4cc44..4d11e81ed6 100755
--- a/tools/oss-fuzz.sh
+++ b/tools/oss-fuzz.sh
@@ -35,8 +35,10 @@ fi
 meson $build -D$fuzzflag -Db_lundef=false
 ninja -C $build fuzzers
 
-for d in "$(dirname "$0")/../test/fuzz-corpus/"*; do
-        zip -jqr $OUT/fuzz-$(basename "$d")_seed_corpus.zip "$d"
+# The seed corpus is a separate flat archive for each fuzzer,
+# with a fixed name ${fuzzer}_seed_corpus.zip.
+for d in "$(dirname "$0")/../test/fuzz/fuzz-"*; do
+        zip -jqr $OUT/$(basename "$d")_seed_corpus.zip "$d"
 done
 
 # get fuzz-dns-packet corpus