diff --git a/docker-compose.yml b/docker-compose.yml
index b770b44..5c851d2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,6 +31,8 @@ services:
     networks:
       acmenet:
         ipv4_address: 10.30.50.4
+        aliases:
+          - getssl.test
 
 networks:
   acmenet:
diff --git a/test/run-test.sh b/test/run-test.sh
index b983899..32bea02 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -7,29 +7,31 @@ if [[ -d /root/.getssl ]]; then
     rm -r /root/.getssl
 fi
 
+HOST=getssl.test
+
 wget --no-clobber https://raw.githubusercontent.com/letsencrypt/pebble/master/test/certs/pebble.minica.pem
 # cat /etc/pki/tls/certs/ca-bundle.crt /root/pebble.minica.pem > /root/pebble-ca-bundle.crt
 cat /etc/ssl/certs/ca-certificates.crt /root/pebble.minica.pem > /root/pebble-ca-bundle.crt
 export CURL_CA_BUNDLE=/root/pebble-ca-bundle.crt
 
-curl -X POST -d '{"host":"getssl", "addresses":["10.30.50.4"]}' http://10.30.50.3:8055/add-a
+curl -X POST -d '{"host":"'$HOST'", "addresses":["10.30.50.4"]}' http://10.30.50.3:8055/add-a
 
 # Test #1 - http-01 verification
 echo Test \#1 - http-01 verification
 
 cp /getssl/test/test-config/nginx-ubuntu-no-ssl /etc/nginx/sites-enabled/default
 service nginx restart
-/getssl/getssl -c getssl
-cp /getssl/test/test-config/getssl-http01.cfg /root/.getssl/getssl/getssl.cfg
-/getssl/getssl -f getssl
+/getssl/getssl -c $HOST
+cp /getssl/test/test-config/getssl-http01.cfg /root/.getssl/${HOST}/getssl.cfg
+/getssl/getssl -f $HOST
 
 # Test #2 - http-01 forced renewal
 echo Test \#2 - http-01 forced renewal
 
-# There's a race condition if renew too soon (authlink returns "valid" instead of "pending")
-echo Sleeping 20s to allow previous validation to expire
-sleep 20
-/getssl/getssl getssl -f
+# Remove previous validation tokens
+rm -rf /var/www/html/.well-known
+service nginx restart
+/getssl/getssl $HOST -f
 
 # Test cleanup
 rm -r /root/.getssl
@@ -39,9 +41,9 @@ echo Test \#3 - dns-01 verification
 
 cp /getssl/test/test-config/nginx-ubuntu-no-ssl /etc/nginx/sites-enabled/default
 service nginx restart
-/getssl/getssl -c getssl
-cp /getssl/test/test-config/getssl-dns01.cfg /root/.getssl/getssl/getssl.cfg
-/getssl/getssl getssl
+/getssl/getssl -c $HOST
+cp /getssl/test/test-config/getssl-dns01.cfg /root/.getssl/${HOST}/getssl.cfg
+/getssl/getssl $HOST
 
 # Test #4 - dns-01 forced renewal
 echo Test \#4 - dns-01 forced renewal
@@ -50,4 +52,4 @@ echo Test \#4 - dns-01 forced renewal
 echo Sleeping 30s to allow previous validation to expire
 sleep 30
 
-/getssl/getssl getssl -f
+/getssl/getssl $HOST -f