diff --git a/database/artix7/settings.sh b/database/artix7/settings.sh
index faa263b9..5979e1d0 100644
--- a/database/artix7/settings.sh
+++ b/database/artix7/settings.sh
@@ -13,5 +13,7 @@ export XRAY_PIN_03="D21"
 export XRAY_PIN_04="G21"
 export XRAY_PIN_05="G22"
 export XRAY_PIN_06="F21"
+export XRAY_HCLK_L="HCLK_L_X36Y130"
+export XRAY_HCLK_R="HCLK_R_X37Y130"
 
 source $(dirname ${BASH_SOURCE[0]})/../../utils/environment.sh
diff --git a/database/kintex7/settings.sh b/database/kintex7/settings.sh
index b4632b78..7422040f 100644
--- a/database/kintex7/settings.sh
+++ b/database/kintex7/settings.sh
@@ -14,5 +14,7 @@ export XRAY_PIN_03="L25"
 export XRAY_PIN_04="M19"
 export XRAY_PIN_05="M20"
 export XRAY_PIN_06="M21"
+export XRAY_HCLK_L="HCLK_L_X25Y78"
+export XRAY_HCLK_R="HCLK_R_X26Y78"
 
 source $(dirname ${BASH_SOURCE[0]})/../../utils/environment.sh
diff --git a/fuzzers/058-hclkpips/generate.tcl b/fuzzers/058-hclkpips/generate.tcl
index 0737adca..5ccc35af 100644
--- a/fuzzers/058-hclkpips/generate.tcl
+++ b/fuzzers/058-hclkpips/generate.tcl
@@ -21,8 +21,8 @@ write_checkpoint -force design.dcp
 
 source ../../../utils/utils.tcl
 
-if [regexp "_001$" [pwd]] {set tile [get_tiles HCLK_L_X36Y130]}
-if [regexp "_002$" [pwd]] {set tile [get_tiles HCLK_R_X37Y130]}
+if [regexp "_001$" [pwd]] {set tile [get_tiles $::env(XRAY_HCLK_L)]}
+if [regexp "_002$" [pwd]] {set tile [get_tiles $::env(XRAY_HCLK_R)]}
 
 set net [get_nets o_OBUF]
 set pips [get_pips -of_objects $tile]