diff --git a/fuzzers/int_loop.mk b/fuzzers/int_loop.mk
index 26b18863..3f5056f0 100644
--- a/fuzzers/int_loop.mk
+++ b/fuzzers/int_loop.mk
@@ -42,7 +42,7 @@ ifneq ($(QUICK),Y)
 	${XRAY_DBFIXUP} --db-root build --clb-int
 	# https://github.com/SymbiFlow/prjxray/issues/399
 	# Clobber existing .db to eliminate potential conflicts
-	if [ -f ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db ] ; then cp ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db build/database/${XRAY_DATABASE}; else bash ${XRAY_DIR}/fuzzers/int_create_empty_db.sh; fi
+	cp ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db build/database/${XRAY_DATABASE}
 	XRAY_DATABASE_DIR=${FUZDIR}/build/database ${XRAY_MERGEDB} int_l build/segbits_int_l.db
 	XRAY_DATABASE_DIR=${FUZDIR}/build/database ${XRAY_MERGEDB} int_r build/segbits_int_r.db
 endif
@@ -81,7 +81,7 @@ build/todo.txt: build/$(PIP_TYPE)_l.txt $(XRAY_DIR)/fuzzers/int_maketodo.py buil
 # Subsequent are based on updated db
 build/database/seeded:
 	mkdir -p build/database/${XRAY_DATABASE}
-	if [ -f ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db ] ; then cp ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db build/database/${XRAY_DATABASE}; else bash ${XRAY_DIR}/fuzzers/int_create_empty_db.sh; fi
+	cp ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db build/database/${XRAY_DATABASE}
 	touch build/database/seeded
 
 # XXX: conider moving to script
diff --git a/settings/artix7.sh b/settings/artix7.sh
index b6d90a2f..78db509a 100644
--- a/settings/artix7.sh
+++ b/settings/artix7.sh
@@ -24,3 +24,4 @@ export XRAY_PIN_05="G22"
 export XRAY_PIN_06="F21"
 
 source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh
+init_db
diff --git a/settings/kintex7.sh b/settings/kintex7.sh
index acd366a3..152286ae 100644
--- a/settings/kintex7.sh
+++ b/settings/kintex7.sh
@@ -24,3 +24,4 @@ export XRAY_PIN_05="M20"
 export XRAY_PIN_06="M21"
 
 source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh
+init_db
diff --git a/settings/zynq7.sh b/settings/zynq7.sh
index 9ce6bd40..50815271 100644
--- a/settings/zynq7.sh
+++ b/settings/zynq7.sh
@@ -24,3 +24,4 @@ export XRAY_PIN_05="J16"
 export XRAY_PIN_06="J15"
 
 source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh
+init_db
diff --git a/utils/environment.sh b/utils/environment.sh
index eb6ee049..5b0c18c6 100644
--- a/utils/environment.sh
+++ b/utils/environment.sh
@@ -44,3 +44,41 @@ if [ $(${XRAY_VIVADO} -h |grep Vivado |cut -d\  -f 2) != "v2017.2" ] ; then
     export XRAY_DIR="/bad/vivado/version"
     return
 fi
+
+function init_db
+{
+  # Check if database files exist. If don't, create empty ones
+  db_files="mask_clbll_l.db \
+            mask_clbll_r.db \
+            mask_clblm_l.db \
+            mask_clblm_r.db \
+            mask_hclk_l.db \
+            mask_hclk_r.db \
+            ppips_clbll_l.db \
+            ppips_clbll_r.db \
+            ppips_clblm_l.db \
+            ppips_clblm_r.db \
+            ppips_hclk_l.db \
+            ppips_hclk_r.db \
+            ppips_int_l.db \
+            ppips_int_r.db \
+            segbits_bram_l.block_ram.db \
+            segbits_bram_l.db \
+            segbits_bram_r.block_ram.db \
+            segbits_bram_r.db \
+            segbits_clbll_l.db \
+            segbits_clbll_r.db \
+            segbits_clblm_l.db \
+            segbits_clblm_r.db \
+            segbits_hclk_l.db \
+            segbits_hclk_r.db \
+            segbits_int_l.db \
+            segbits_int_r.db"
+
+  for db in $db_files
+  do
+    if [ ! -f ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/$db ]; then
+      touch ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/$db
+    fi
+  done
+}