diff --git a/fuzzers/065-gtp-common-pips/Makefile b/fuzzers/065-gtp-common-pips/Makefile
index 54580674..3a7ab88c 100644
--- a/fuzzers/065-gtp-common-pips/Makefile
+++ b/fuzzers/065-gtp-common-pips/Makefile
@@ -54,7 +54,7 @@ $(BUILD_DIR)/cmt_regions.csv: output_cmt.tcl
 	cd $(BUILD_DIR)/ && ${XRAY_VIVADO} -mode batch -source ${FUZDIR}/output_cmt.tcl
 
 clean:
-	rm -rf build_* run.*.ok
+	rm -rf ${BUILD_DIR} ${RUN_OK}
 
 pushdb: database
 	${XRAY_MERGEDB} gtp_common_mid_left $(BUILD_DIR)/segbits_gtp_common.db
diff --git a/fuzzers/065b-gtp-common-pips/Makefile b/fuzzers/065b-gtp-common-pips/Makefile
index 73380916..347f3cb1 100644
--- a/fuzzers/065b-gtp-common-pips/Makefile
+++ b/fuzzers/065b-gtp-common-pips/Makefile
@@ -53,7 +53,7 @@ $(BUILD_DIR)/cmt_regions.csv: output_cmt.tcl
 	cd $(BUILD_DIR)/ && ${XRAY_VIVADO} -mode batch -source ${FUZDIR}/output_cmt.tcl
 
 clean:
-	rm -rf build_* run.*.ok
+	rm -rf ${BUILD_DIR} ${RUN_OK}
 
 pushdb: database
 	${XRAY_MERGEDB} gtp_common_mid_left $(BUILD_DIR)/segbits_gtp_common.db
diff --git a/fuzzers/072-ordered_wires/Makefile b/fuzzers/072-ordered_wires/Makefile
index 1905e5e4..92ab82e3 100644
--- a/fuzzers/072-ordered_wires/Makefile
+++ b/fuzzers/072-ordered_wires/Makefile
@@ -7,7 +7,10 @@
 # SPDX-License-Identifier: ISC
 
 N := 1
+
 BUILD_DIR = build_${XRAY_PART}
+RUN_OK = run.${XRAY_PART}.ok
+
 SPECIMENS := $(addprefix $(BUILD_DIR)/specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 MAX_VIVADO_PROCESS ?= 4
@@ -24,13 +27,13 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
+	rm -rf $(BUILD_DIR) $(RUN_OK)
 	$(MAKE) database
 	$(MAKE) pushdb
-	touch run.${XRAY_PART}.ok
+	touch $(RUN_OK)
 
 clean:
-	rm -rf build_* run.*.ok
+	rm -rf ${BUILD_DIR} ${RUN_OK}
 
 .PHONY: database pushdb run clean
 
diff --git a/fuzzers/073-get_counts/Makefile b/fuzzers/073-get_counts/Makefile
index 4cf0c021..28a9e549 100644
--- a/fuzzers/073-get_counts/Makefile
+++ b/fuzzers/073-get_counts/Makefile
@@ -7,7 +7,10 @@
 # SPDX-License-Identifier: ISC
 
 N := 1
+
 BUILD_DIR = build_${XRAY_PART}
+RUN_OK = run.${XRAY_PART}.ok
+
 SPECIMENS := $(addprefix $(BUILD_DIR)/specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
@@ -22,13 +25,13 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
+	rm -rf $(BUILD_DIR) $(RUN_OK)
 	$(MAKE) database
 	$(MAKE) pushdb
-	touch run.${XRAY_PART}.ok
+	touch $(RUN_OK)
 
 clean:
-	rm -rf build_* run.*.ok
+	rm -rf ${BUILD_DIR} ${RUN_OK}
 
 .PHONY: database pushdb run clean
 
diff --git a/fuzzers/074-dump_all/Makefile b/fuzzers/074-dump_all/Makefile
index d2dcabd5..2e8106dc 100644
--- a/fuzzers/074-dump_all/Makefile
+++ b/fuzzers/074-dump_all/Makefile
@@ -7,7 +7,10 @@
 # SPDX-License-Identifier: ISC
 
 N := 1
+
 BUILD_DIR = build_${XRAY_PART}
+RUN_OK = run.${XRAY_PART}.ok
+
 SPECIMENS := $(addprefix $(BUILD_DIR)/specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 MAX_VIVADO_PROCESS ?= 4
@@ -34,10 +37,10 @@ run:
 	$(MAKE) pushdb
 	# Clean up intermediate files after successful pushdb.
 	find $(BUILD_DIR) -name "*.json5" -delete
-	touch run.${XRAY_PART}.ok
+	touch ${RUN_OK}
 
 clean:
-	rm -rf build_* run.*.ok
+	rm -rf ${BUILD_DIR} ${RUN_OK}
 
 .PHONY: database pushdb run clean
 
diff --git a/fuzzers/075-pins/Makefile b/fuzzers/075-pins/Makefile
index 153c8035..1b167c3e 100644
--- a/fuzzers/075-pins/Makefile
+++ b/fuzzers/075-pins/Makefile
@@ -7,6 +7,8 @@
 # SPDX-License-Identifier: ISC
 N := 1
 BUILD_DIR = build_${XRAY_PART}
+RUN_OK = run.${XRAY_PART}.ok
+
 SPECIMENS := $(addprefix $(BUILD_DIR)/specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
@@ -21,12 +23,12 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
+	rm -rf $(BUILD_DIR) $(RUN_OK)
 	$(MAKE) database
 	$(MAKE) pushdb
-	touch run.$(XRAY_PART).ok
+	touch $(RUN_OK)
 
 clean:
-	rm -rf build_* run.*.ok
+	rm -rf ${BUILD_DIR} ${RUN_OK}
 
 .PHONY: database pushdb run clean