diff --git a/fuzzers/011-ffconfig/Makefile b/fuzzers/011-ffconfig/Makefile
index f0b20f11..32d9aff0 100644
--- a/fuzzers/011-ffconfig/Makefile
+++ b/fuzzers/011-ffconfig/Makefile
@@ -4,13 +4,13 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
 database: $(SPECIMENS_OK)
-	../../tools/segmatch -o seg_clblx.segbits $(addsuffix /segdata_clbl[lm]_[lr]_[0-9].txt,$(SPECIMENS))
+	${XRAY_SEGMATCH} -o seg_clblx.segbits $(addsuffix /segdata_clbl[lm]_[lr]_[0-9].txt,$(SPECIMENS))
 
 pushdb:
-	bash ../../utils/mergedb.sh clbll_l seg_clblx.segbits
-	bash ../../utils/mergedb.sh clbll_r seg_clblx.segbits
-	bash ../../utils/mergedb.sh clblm_l seg_clblx.segbits
-	bash ../../utils/mergedb.sh clblm_r seg_clblx.segbits
+	${XRAY_MERGEDB} clbll_l seg_clblx.segbits
+	${XRAY_MERGEDB} clbll_r seg_clblx.segbits
+	${XRAY_MERGEDB} clblm_l seg_clblx.segbits
+	${XRAY_MERGEDB} clblm_r seg_clblx.segbits
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/011-ffconfig/generate.sh b/fuzzers/011-ffconfig/generate.sh
index 313a7a27..ffbcc6d9 100644
--- a/fuzzers/011-ffconfig/generate.sh
+++ b/fuzzers/011-ffconfig/generate.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source ../../utils/environment.sh
 source ${XRAY_GENHEADER}
 
 echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh