test.diff

diff --git a/test/lib/setup b/test/lib/setup
index ee67152..0cb551c 100755
--- a/test/lib/setup
+++ b/test/lib/setup
@@ -47,9 +47,12 @@ setup_passt() {
 	[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
 	[ ${VHOST_USER} -eq 1 ] && __opts="${__opts} --vhost-user"
 
-	context_run passt "make clean"
+    __opts="${__opts} -H ${PASST_HOSTNAME}"
+    __opts="${__opts} --fqdn ${PASST_FQDN}"
+
+    context_run passt "make clean"
 	context_run passt "make valgrind"
-	context_run_bg passt "valgrind --max-stackframe=$((4 * 1024 * 1024)) --trace-children=yes --vgdb=no --error-exitcode=1 --suppressions=test/valgrind.supp ./passt ${__opts} -s ${STATESETUP}/passt.socket -f -t 10001 -u 10001 -H hostname1 --fqdn fqdn1.passt.test -P ${STATESETUP}/passt.pid"
+	context_run_bg passt "valgrind --max-stackframe=$((4 * 1024 * 1024)) --trace-children=yes --vgdb=no --error-exitcode=1 --suppressions=test/valgrind.supp ./passt ${__opts} -s ${STATESETUP}/passt.socket -f -t 10001 -u 10001 -P ${STATESETUP}/passt.pid"
 
 	# pidfile isn't created until passt is listening
 	wait_for [ -f "${STATESETUP}/passt.pid" ]
diff --git a/test/passt/dhcp b/test/passt/dhcp
index 145f1ba..59b77db 100644
--- a/test/passt/dhcp
+++ b/test/passt/dhcp
@@ -49,11 +49,11 @@ check	[ "__SEARCH__" = "__HOST_SEARCH__" ]
 
 test	DHCP: Hostname
 gout	NEW_HOST_NAME cat /tmp/new_host_name
-check	[ "__NEW_HOST_NAME__" = "hostname1" ]
+check	[ "__NEW_HOST_NAME__" = "${PASST_HOSTNAME}" ]
 
 test	DHCP: Client FQDN
 gout	NEW_FQDN_FQDN cat /tmp/new_fqdn_fqdn
-check	[ "__NEW_FQDN_FQDN__" = "fqdn1.passt.test" ]
+check	[ "__NEW_FQDN_FQDN__" = "${PASST_FQDN}" ]
 
 test	DHCPv6: address
 guest	rm /tmp/new_fqdn_fqdn
@@ -82,4 +82,4 @@ check	[ "__SEARCH6__" = "__HOST_SEARCH6__" ]
 
 test	DHCPv6: Hostname
 gout	NEW_FQDN_FQDN cat /tmp/new_fqdn_fqdn
-check	[ "__NEW_FQDN_FQDN__" = "fqdn1.passt.test" ]
+check	[ "__NEW_FQDN_FQDN__" = "${PASST_FQDN}" ]
diff --git a/test/run b/test/run
index f188d8e..438b820 100755
--- a/test/run
+++ b/test/run
@@ -43,6 +43,9 @@ KERNEL=${KERNEL:-"/boot/vmlinuz-$(uname -r)"}
 
 COMMIT="$(git log --oneline --no-decorate -1)"
 
+PASST_HOSTNAME=${PASST_HOSTNAME:-hostname1}
+PASST_FQDN=${PASST_FQDN:-fqdn1.passt.test}
+
 . lib/util
 . lib/context
 . lib/setup