diff --git a/fuzzers/050-intpips/Makefile b/fuzzers/050-intpips/Makefile
index eccb2cd3..6e3b0f05 100644
--- a/fuzzers/050-intpips/Makefile
+++ b/fuzzers/050-intpips/Makefile
@@ -25,10 +25,13 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	+set -ex; make clean; make; make pushdb
+	$(MAKE) clean
+	$(MAKE) database
+	$(MAKE) pushdb
+	touch run.ok
 
 clean:
-	rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits
+	rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits run.ok
 
 .PHONY: database pushdb run clean
 
diff --git a/fuzzers/051-imuxlout/Makefile b/fuzzers/051-imuxlout/Makefile
index e9a4c82f..da59695b 100644
--- a/fuzzers/051-imuxlout/Makefile
+++ b/fuzzers/051-imuxlout/Makefile
@@ -21,10 +21,11 @@ todo.txt:
 	python3 maketodo.py > todo.txt
 
 run:
-	+set -ex; while make clean; make todo.txt; test -s todo.txt; do make; make pushdb; done; true
+	+set -ex; while make clean; make todo.txt; test -s todo.txt; do make database; make pushdb; done; true
+	touch run.ok
 
 clean:
-	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits
+	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok
 	rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt
 	rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits
 
diff --git a/fuzzers/052-clkin/Makefile b/fuzzers/052-clkin/Makefile
index d8f82463..5d71a14a 100644
--- a/fuzzers/052-clkin/Makefile
+++ b/fuzzers/052-clkin/Makefile
@@ -21,10 +21,11 @@ todo.txt:
 	python3 maketodo.py | sort -R | head -n10 > todo.txt
 
 run:
-	+set -ex; while make clean; make todo.txt; test -s todo.txt; do make; make pushdb; done; true
+	+set -ex; while make clean; make todo.txt; test -s todo.txt; do make database; make pushdb; done; true
+	touch run.ok
 
 clean:
-	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits
+	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok
 	rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt
 	rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits
 
diff --git a/fuzzers/053-ctrlin/Makefile b/fuzzers/053-ctrlin/Makefile
index d8f82463..5d71a14a 100644
--- a/fuzzers/053-ctrlin/Makefile
+++ b/fuzzers/053-ctrlin/Makefile
@@ -21,10 +21,11 @@ todo.txt:
 	python3 maketodo.py | sort -R | head -n10 > todo.txt
 
 run:
-	+set -ex; while make clean; make todo.txt; test -s todo.txt; do make; make pushdb; done; true
+	+set -ex; while make clean; make todo.txt; test -s todo.txt; do make database; make pushdb; done; true
+	touch run.ok
 
 clean:
-	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits
+	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok
 	rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt
 	rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits
 
diff --git a/fuzzers/054-gfan/Makefile b/fuzzers/054-gfan/Makefile
index d8f82463..5d71a14a 100644
--- a/fuzzers/054-gfan/Makefile
+++ b/fuzzers/054-gfan/Makefile
@@ -21,10 +21,11 @@ todo.txt:
 	python3 maketodo.py | sort -R | head -n10 > todo.txt
 
 run:
-	+set -ex; while make clean; make todo.txt; test -s todo.txt; do make; make pushdb; done; true
+	+set -ex; while make clean; make todo.txt; test -s todo.txt; do make database; make pushdb; done; true
+	touch run.ok
 
 clean:
-	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits
+	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok
 	rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt
 	rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits
 
diff --git a/fuzzers/055-gnd/Makefile b/fuzzers/055-gnd/Makefile
index 7ff0abff..069063e0 100644
--- a/fuzzers/055-gnd/Makefile
+++ b/fuzzers/055-gnd/Makefile
@@ -23,10 +23,13 @@ todo.txt:
 	echo "INT_R.GFAN1.GND_WIRE" >> todo.txt
 
 run:
-	+set -ex; make clean; make; make pushdb
+	$(MAKE) clean
+	$(MAKE) database
+	$(MAKE) pushdb
+	touch run.ok
 
 clean:
-	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits
+	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok
 	rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt
 	rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits
 
diff --git a/fuzzers/056-rempips/Makefile b/fuzzers/056-rempips/Makefile
index 339a1cff..9c96fe66 100644
--- a/fuzzers/056-rempips/Makefile
+++ b/fuzzers/056-rempips/Makefile
@@ -21,10 +21,11 @@ todo.txt:
 	python3 maketodo.py | sort -R | head -n10 > todo.txt
 
 run:
-	+set -ex; while make clean; make todo.txt; test -s todo.txt; do if make; then make pushdb; fi; done; true
+	+set -ex; while make clean; make todo.txt; test -s todo.txt; do if make database; then make pushdb; fi; done; true
+	touch run.ok
 
 clean:
-	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits
+	rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok
 	rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt
 	rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits
 
diff --git a/fuzzers/057-bipips/Makefile b/fuzzers/057-bipips/Makefile
index 4cf12810..4ade5699 100644
--- a/fuzzers/057-bipips/Makefile
+++ b/fuzzers/057-bipips/Makefile
@@ -21,10 +21,11 @@ todo.txt:
 	python3 maketodo.py | sort -R | head -n5 > todo.txt
 
 run:
-	+set -ex; while make clean; make todo.txt; test -s todo.txt; do make; make pushdb; done; true
+	+set -ex; while make clean; make todo.txt; test -s todo.txt; do make database; make pushdb; done; true
+	touch run.ok
 
 clean:
-	rm -rf .Xil/ .cache/ vivado* todo.txt
+	rm -rf .Xil/ .cache/ vivado* todo.txt run.ok
 	rm -rf bipiplist/ bipiplist.dcp bipips_int_[lr].txt
 	rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits
 
diff --git a/fuzzers/058-hclkpips/Makefile b/fuzzers/058-hclkpips/Makefile
index 477b9a06..df6a8fd4 100644
--- a/fuzzers/058-hclkpips/Makefile
+++ b/fuzzers/058-hclkpips/Makefile
@@ -25,10 +25,12 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	+set -ex; make clean; make; make pushdb
+	$(MAKE) clean
+	$(MAKE) database
+	$(MAKE) pushdb
 
 clean:
-	rm -rf specimen_[0-9][0-9][0-9]/ seg_hclk_[lr].segbits mask_hclk_[lr].segbits ppips_hclk_[lr].txt
+	rm -rf specimen_[0-9][0-9][0-9]/ seg_hclk_[lr].segbits mask_hclk_[lr].segbits ppips_hclk_[lr].txt run.ok
 
 .PHONY: database pushdb run clean
 
diff --git a/fuzzers/070-tileconn/Makefile b/fuzzers/070-tileconn/Makefile
index 40eec548..73b0a649 100644
--- a/fuzzers/070-tileconn/Makefile
+++ b/fuzzers/070-tileconn/Makefile
@@ -14,10 +14,13 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	+set -ex; make clean; make; make pushdb
+	$(MAKE) clean
+	$(MAKE) database
+	$(MAKE) pushdb
+	touch run.ok
 
 clean:
-	rm -rf specimen_[0-9][0-9][0-9]/ tileconn.json
+	rm -rf specimen_[0-9][0-9][0-9]/ tileconn.json run.ok
 
 .PHONY: database pushdb run clean
 
diff --git a/fuzzers/071-ppips/Makefile b/fuzzers/071-ppips/Makefile
index a0064299..d6583293 100644
--- a/fuzzers/071-ppips/Makefile
+++ b/fuzzers/071-ppips/Makefile
@@ -24,10 +24,13 @@ $(SPECIMENS_OK):
 	touch $@
 
 run:
-	+set -ex; make clean; make; make pushdb
+	$(MAKE) clean
+	$(MAKE) database
+	$(MAKE) pushdb
+	touch run.ok
 
 clean:
-	rm -rf specimen_[0-9][0-9][0-9]/ ppips_clbl[ml]_[lr].txt ppips_int_[lr].txt
+	rm -rf specimen_[0-9][0-9][0-9]/ ppips_clbl[ml]_[lr].txt ppips_int_[lr].txt run.ok
 
 .PHONY: database pushdb run clean