diff --git a/ngcp-system-tests b/ngcp-system-tests
index f7ac9ba..86459a7 100755
--- a/ngcp-system-tests
+++ b/ngcp-system-tests
@@ -83,12 +83,16 @@ case "${NGCP_TESTS_MODE}" in
     esac
     export DEBIAN_RELEASE
 
-    # We need to export these, so that goss sees existent variables.
-    export SKIP_DNS_CHECK_TEST=${SKIP_DNS_CHECK_TEST:-false}
-    export SKIP_STRICT_HOSTNAME_TEST=${SKIP_STRICT_HOSTNAME_TEST:-false}
+    VARS=$(mktemp --tmpdir ngcp-system-tests.XXXXXXXXXX.yaml)
+    trap 'rm -f "${VARS}"' EXIT
+    cat >"${VARS}" <<-EOF
+SKIP_DNS_CHECK_TEST: ${SKIP_DNS_CHECK_TEST:-false}
+SKIP_STRICT_HOSTNAME_TEST: ${SKIP_STRICT_HOSTNAME_TEST:-false}
+EOF
 
     PLAN='/etc/ngcp-system-tests/goss.yaml'
 
-    goss -g "${PLAN}" validate --format "${NGCP_TESTS_MODE}"
+    goss --gossfile "${PLAN}" --vars "${VARS}" \
+      validate --format "${NGCP_TESTS_MODE}"
     ;;
 esac
diff --git a/templates/800_network-hostname.yaml.tt2 b/templates/800_network-hostname.yaml.tt2
index 2ec0ee0..7377eec 100644
--- a/templates/800_network-hostname.yaml.tt2
+++ b/templates/800_network-hostname.yaml.tt2
@@ -15,7 +15,7 @@ command:
   hostname:
     exit-status: 0
 
-{{if ne .Env.SKIP_STRICT_HOSTNAME_TEST "true"}}
+{{if .Vars.SKIP_STRICT_HOSTNAME_TEST}}
   hostname:
     exit-status: 0
     stdout:
diff --git a/templates/goss.yaml.tt2 b/templates/goss.yaml.tt2
index 6010121..6ef0ce4 100644
--- a/templates/goss.yaml.tt2
+++ b/templates/goss.yaml.tt2
@@ -22,7 +22,7 @@ gossfile:
   610_kernel-sysctl-params.yaml: {}
   615_kernel-modules.yaml: {}
   800_network-hostname.yaml: {}
-{{if ne .Env.SKIP_DNS_CHECK_TEST "true"}}
+{{if .Vars.SKIP_DNS_CHECK_TEST}}
   810_network-dns-debian.yaml: {}
 [%   IF general.ngcp_type == 'spce' -%]
   811_network-dns-ngcp-ce.yaml: {}