diff --git a/.github/workflows/fuzz-nightly.yml b/.github/workflows/fuzz-nightly.yml
index 9e67aed53..bc668ecd0 100644
--- a/.github/workflows/fuzz-nightly.yml
+++ b/.github/workflows/fuzz-nightly.yml
@@ -23,24 +23,9 @@ jobs:
         working-directory: test/fuzz
         run: go get -u github.com/dvyukov/go-fuzz/go-fuzz github.com/dvyukov/go-fuzz/go-fuzz-build
 
-      - name: Fuzz mempool-v1
+      - name: Fuzz mempool
         working-directory: test/fuzz
-        run: timeout -s SIGINT --preserve-status 10m make fuzz-mempool-v1
-        continue-on-error: true
-
-      - name: Fuzz mempool-v0
-        working-directory: test/fuzz
-        run: timeout -s SIGINT --preserve-status 10m make fuzz-mempool-v0
-        continue-on-error: true
-
-      - name: Fuzz p2p-addrbook
-        working-directory: test/fuzz
-        run: timeout -s SIGINT --preserve-status 10m make fuzz-p2p-addrbook
-        continue-on-error: true
-
-      - name: Fuzz p2p-pex
-        working-directory: test/fuzz
-        run: timeout -s SIGINT --preserve-status 10m make fuzz-p2p-pex
+        run: timeout -s SIGINT --preserve-status 10m make fuzz-mempool
         continue-on-error: true
 
       - name: Fuzz p2p-sc
diff --git a/test/fuzz/Makefile b/test/fuzz/Makefile
index 3d34e0a43..3bf4486b8 100644
--- a/test/fuzz/Makefile
+++ b/test/fuzz/Makefile
@@ -1,38 +1,15 @@
 #!/usr/bin/make -f
 
-.PHONY: fuzz-mempool-v1
-fuzz-mempool-v1:
-	cd mempool/v1 && \
+.PHONY: fuzz-mempool
+fuzz-mempool:
+	cd mempool && \
 		rm -f *-fuzz.zip && \
 		go-fuzz-build && \
 		go-fuzz
 
-.PHONY: fuzz-mempool-v0
-fuzz-mempool-v0:
-	cd mempool/v0 && \
-		rm -f *-fuzz.zip && \
-		go-fuzz-build && \
-		go-fuzz
-
-.PHONY: fuzz-p2p-addrbook
-fuzz-p2p-addrbook:
-	cd p2p/addrbook && \
-		rm -f *-fuzz.zip && \
-		go run ./init-corpus/main.go && \
-		go-fuzz-build && \
-		go-fuzz
-
-.PHONY: fuzz-p2p-pex
-fuzz-p2p-pex:
-	cd p2p/pex && \
-		rm -f *-fuzz.zip && \
-		go run ./init-corpus/main.go && \
-		go-fuzz-build && \
-		go-fuzz
-
 .PHONY: fuzz-p2p-sc
 fuzz-p2p-sc:
-	cd p2p/secret_connection && \
+	cd p2p/secretconnection && \
 		rm -f *-fuzz.zip && \
 		go run ./init-corpus/main.go && \
 		go-fuzz-build && \