diff --git a/test/37-idn.bats b/test/37-idn.bats
index 7b91827..be624de 100644
--- a/test/37-idn.bats
+++ b/test/37-idn.bats
@@ -7,14 +7,13 @@ load '/getssl/test/test_helper.bash'
 setup_file() {
     if [ -z "$STAGING" ]; then
         export CURL_CA_BUNDLE=/root/pebble-ca-bundle.crt
-        GETSSL_CMD_HOST=${GETSSL_HOST/getssl/xn--t-r1a81lydm69gz81r}
-        curl --silent -X POST -d '{"host":"'$GETSSL_CMD_HOST'", "addresses":["'$GETSSL_IP'"]}' http://10.30.50.3:8055/add-a
+        curl --silent -X POST -d '{"host":"'$GETSSL_IDN_HOST'", "addresses":["'$GETSSL_IP'"]}' http://10.30.50.3:8055/add-a
     fi
 }
 
 # This is run for every test
 setup() {
-    GETSSL_CMD_HOST=${GETSSL_HOST/getssl/xn--t-r1a81lydm69gz81r}
+    GETSSL_CMD_HOST=${GETSSL_IDN_HOST}
 
     # use the test description to move tools we don't want to test out of the way
     DNS_TOOL=${BATS_TEST_DESCRIPTION##*:}
@@ -39,7 +38,7 @@ teardown() {
 
 teardown_file() {
     if [ -z "$STAGING" ]; then
-        curl --silent -X POST -d '{"host":"'$GETSSL_CMD_HOST'", "addresses":["'$GETSSL_IP'"]}' http://10.30.50.3:8055/clear-a
+        curl --silent -X POST -d '{"host":"'$GETSSL_IDN_HOST'", "addresses":["'$GETSSL_IP'"]}' http://10.30.50.3:8055/clear-a
     fi
 }
 
diff --git a/test/run-test.cmd b/test/run-test.cmd
index 88e692d..44c46be 100644
--- a/test/run-test.cmd
+++ b/test/run-test.cmd
@@ -8,11 +8,11 @@ SET COMMAND=%2 %3
 
 :CheckAlias
 REM check if OS *contains* staging
+SET GETSSL_IDN_HOST=%OS%.xn--t-r1a81lydm69gz81r.test
 IF NOT x%OS:duck=%==x%OS% GOTO duckdns
 IF NOT x%OS:dynu=%==x%OS% GOTO dynu
 IF NOT x%OS:bash=%==x%OS% GOTO bash
 SET ALIAS=%OS%.getssl.test
-SET IDN=%OS%.xn--t-r1a81lydm69gz81r.test
 SET STAGING=
 SET GETSSL_OS=%OS%
 GOTO Run
@@ -51,12 +51,13 @@ IF %ErrorLevel% EQU 1 GOTO End
 @echo on
 docker run -it ^
   --env GETSSL_HOST=%ALIAS% %STAGING% ^
+  --env GETSSL_IDN_HOST=%GETSSL_IDN_HOST% ^
   --env GETSSL_OS=%GETSSL_OS% ^
   -v %cd%:/getssl ^
   --rm ^
   --network %CurrDirName%_acmenet ^
   --network-alias %ALIAS% ^
-  --network-alias %IDN% ^
+  --network-alias %GETSSL_IDN_HOST% ^
   --network-alias a.%OS%.getssl.test ^
   --network-alias b.%OS%.getssl.test ^
   --network-alias c.%OS%.getssl.test ^
diff --git a/test/run-test.sh b/test/run-test.sh
index 8f405e1..c3852ef 100755
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -15,7 +15,7 @@ else
 fi
 
 ALIAS="$OS.getssl.test"
-IDN="$OS.xn--t-r1a81lydm69gz81r.test"
+GETSSL_IDN_HOST="$OS.xn--t-r1a81lydm69gz81r.test"
 STAGING=""
 GETSSL_OS=$OS
 
@@ -35,12 +35,13 @@ docker build --rm -f "test/Dockerfile-$OS" -t "getssl-$OS" .
 # shellcheck disable=SC2086
 docker run \
   --env GETSSL_HOST=$ALIAS $STAGING \
+  --env GETSSL_IDN_HOST=$GETSSL_IDN_HOST \
   --env GETSSL_OS=$GETSSL_OS \
   -v "$(pwd)":/getssl \
   --rm \
   --network ${PWD##*/}_acmenet \
   --network-alias $ALIAS \
-  --network-alias $IDN \
+  --network-alias $GETSSL_IDN_HOST \
   --network-alias "a.$OS.getssl.test" \
   --network-alias "b.$OS.getssl.test" \
   --network-alias "c.$OS.getssl.test" \