diff --git a/fuzzers/048-int-piplist/Makefile b/fuzzers/048-int-piplist/Makefile
new file mode 100644
index 00000000..49f2c540
--- /dev/null
+++ b/fuzzers/048-int-piplist/Makefile
@@ -0,0 +1,28 @@
+PIP_TYPE?=pips_int
+A_PIPLIST?=$(PIP_TYPE)_l.txt
+PIPLIST_TCL?=$(XRAY_FUZZERS_DIR)/piplist/piplist.tcl
+
+all: database
+
+database: $(XRAY_FUZZERS_DIR)/piplist/build/$(A_PIPLIST)
+
+$(XRAY_FUZZERS_DIR)/piplist/build/$(A_PIPLIST): $(PIPLIST_TCL)
+	mkdir -p $(XRAY_FUZZERS_DIR)/piplist/build
+	cd $(XRAY_FUZZERS_DIR)/piplist/build && ${XRAY_VIVADO} -mode batch \
+		-source $(PIPLIST_TCL)
+
+
+pushdb:
+	true
+
+run: database
+	touch run.ok
+
+clean:
+	rm -rf build run.ok
+
+cleanpiplist:
+	rm -rf $(XRAY_FUZZERS_DIR)/piplist/build
+
+.PHONY: all clean cleanpiplist run database pushdb
+
diff --git a/fuzzers/Makefile b/fuzzers/Makefile
index e9e0992e..a024caf0 100644
--- a/fuzzers/Makefile
+++ b/fuzzers/Makefile
@@ -75,17 +75,18 @@ $(eval $(call fuzzer,041-clk-hrow-pips,005-tilegrid))
 # 042 fuzzer is unstable, issue #657
 #$(eval $(call fuzzer,042-clk-bufg-config,005-tilegrid))
 $(eval $(call fuzzer,043-clk-rebuf-pips,005-tilegrid))
-$(eval $(call fuzzer,049-int-imux-gfan,005-tilegrid))
-$(eval $(call fuzzer,050-pip-seed,005-tilegrid))
-$(eval $(call fuzzer,051-pip-imuxlout-bypalts,005-tilegrid))
-$(eval $(call fuzzer,052-pip-clkin,005-tilegrid))
-$(eval $(call fuzzer,053-pip-ctrlin,005-tilegrid))
-$(eval $(call fuzzer,054-pip-fan-alt,005-tilegrid))
-$(eval $(call fuzzer,055-pip-gnd,005-tilegrid))
+$(eval $(call fuzzer,048-int-piplist,005-tilegrid))
+$(eval $(call fuzzer,049-int-imux-gfan,048-int-piplist))
+$(eval $(call fuzzer,050-pip-seed,048-int-piplist))
+$(eval $(call fuzzer,051-pip-imuxlout-bypalts,048-int-piplist))
+$(eval $(call fuzzer,052-pip-clkin,048-int-piplist))
+$(eval $(call fuzzer,053-pip-ctrlin,048-int-piplist))
+$(eval $(call fuzzer,054-pip-fan-alt,048-int-piplist))
+$(eval $(call fuzzer,055-pip-gnd,048-int-piplist))
 $(eval $(call fuzzer,056-pip-rem,049-int-imux-gfan 050-pip-seed 051-pip-imuxlout-bypalts 052-pip-clkin 053-pip-ctrlin 054-pip-fan-alt 055-pip-gnd))
 $(eval $(call fuzzer,057-pip-bi,056-pip-rem))
 ifneq ($(QUICK),Y)
-$(eval $(call fuzzer,058-pip-hclk,056-pip-rem))
+$(eval $(call fuzzer,058-pip-hclk,005-tilegrid))
 $(eval $(call fuzzer,060-bram-cascades,005-tilegrid))
 $(eval $(call fuzzer,071-ppips,057-pip-bi 058-pip-hclk 060-bram-cascades))
 ifneq ($(BITONLY),Y)