diff --git a/testrunner b/testrunner
index bd50a80..0cf002e 100755
--- a/testrunner
+++ b/testrunner
@@ -20,12 +20,17 @@ case "${TYPE}" in
   *) echo "ERRRO: Unknown type '$1'" >&2 ; usage >&2 ; exit 1 ;;
 esac
 
-if [ ! -x /usr/sbin/goss ] ; then
-  echo "Downloading goss and installing as /usr/sbin/goss"
-  curl -L https://deb.sipwise.com/files/goss-0.0.22-linux-amd64 > /usr/sbin/goss
-  chmod +x /usr/sbin/goss
+goss="goss-0.0.22-linux-amd64"
+
+if [ ! -x "/usr/sbin/${goss}" ] ; then
+  echo "Downloading goss and installing as /usr/sbin/${goss}"
+  curl -L "https://deb.sipwise.com/files/${goss}" > "/usr/sbin/${goss}"
+  chmod +x "/usr/sbin/${goss}"
 fi
 
+rm -f /usr/sbin/goss
+ln -s "/usr/sbin/${goss}" /usr/sbin/goss
+
 host_yml_file="/etc/ngcp-config/config.$(hostname).yml"
 if [ -n "${SKIP_DNS_CHECK_TEST}" ] || [ -n "${SKIP_STRICT_HOSTNAME_TEST}" ] ; then
   echo "Configuring host specific YML config: ${host_yml_file}"