diff --git a/fuzzers/035-iob-ilogic/Makefile b/fuzzers/035-iob-ilogic/Makefile
index bb643bb6..8ac93805 100644
--- a/fuzzers/035-iob-ilogic/Makefile
+++ b/fuzzers/035-iob-ilogic/Makefile
@@ -33,18 +33,19 @@ pushdb: build/segbits_rioi.db
 	${XRAY_MERGEDB} rioi3 build/segbits_xioi3.db
 	${XRAY_MERGEDB} rioi3_tbytesrc build/segbits_xioi3.db
 	${XRAY_MERGEDB} rioi3_tbyteterm build/segbits_xioi3.db
-	${XRAY_MERGEDB} rioi build/segbits_rioi.db
-	${XRAY_MERGEDB} rioi_tbytesrc build/segbits_rioi.db
-	${XRAY_MERGEDB} rioi_tbyteterm build/segbits_rioi.db
 	${XRAY_MERGEDB} mask_lioi3 build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_lioi3_tbytesrc build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_lioi3_tbyteterm build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_rioi3 build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_rioi3_tbytesrc build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_rioi3_tbyteterm build/mask_xioi3.db
+ifeq ($(XRAY_DATABASE),kintex7)
+	${XRAY_MERGEDB} rioi build/segbits_rioi.db
+	${XRAY_MERGEDB} rioi_tbytesrc build/segbits_rioi.db
+	${XRAY_MERGEDB} rioi_tbyteterm build/segbits_rioi.db
 	${XRAY_MERGEDB} mask_rioi build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_rioi_tbytesrc build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_rioi_tbyteterm build/mask_xioi3.db
+endif
 
 .PHONY: database pushdb
-
diff --git a/fuzzers/035b-iob-iserdes/Makefile b/fuzzers/035b-iob-iserdes/Makefile
index 8297e97c..a8033051 100644
--- a/fuzzers/035b-iob-iserdes/Makefile
+++ b/fuzzers/035b-iob-iserdes/Makefile
@@ -34,18 +34,20 @@ pushdb: build/segbits_rioi.db
 	${XRAY_MERGEDB} rioi3 build/segbits_xioi3.db
 	${XRAY_MERGEDB} rioi3_tbytesrc build/segbits_xioi3.db
 	${XRAY_MERGEDB} rioi3_tbyteterm build/segbits_xioi3.db
-	${XRAY_MERGEDB} rioi build/segbits_rioi.db
-	${XRAY_MERGEDB} rioi_tbytesrc build/segbits_rioi.db
-	${XRAY_MERGEDB} rioi_tbyteterm build/segbits_rioi.db
 	${XRAY_MERGEDB} mask_lioi3 build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_lioi3_tbytesrc build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_lioi3_tbyteterm build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_rioi3 build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_rioi3_tbytesrc build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_rioi3_tbyteterm build/mask_xioi3.db
+ifeq ($(XRAY_DATABASE),kintex7)
+	${XRAY_MERGEDB} rioi build/segbits_rioi.db
+	${XRAY_MERGEDB} rioi_tbytesrc build/segbits_rioi.db
+	${XRAY_MERGEDB} rioi_tbyteterm build/segbits_rioi.db
 	${XRAY_MERGEDB} mask_rioi build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_rioi_tbytesrc build/mask_xioi3.db
 	${XRAY_MERGEDB} mask_rioi_tbyteterm build/mask_xioi3.db
+endif
 
 .PHONY: database pushdb