diff --git a/reg-tests/server/cli_set_fdqn.vtc b/reg-tests/server/cli_set_fdqn.vtc
deleted file mode 100644
index 86f32b6..0000000
--- a/reg-tests/server/cli_set_fdqn.vtc
+++ /dev/null
@@ -1,32 +0,0 @@
-varnishtest "Set server FQDN via CLI crash"
-
-feature ignore_unknown_macro
-
-# for "set server <srv> fqdn"
-#REGTEST_TYPE=bug
-
-# Do nothing. Is there only to create s1_* macros
-server s1 {
-} -start
-
-haproxy h1 -conf {
-    defaults
-        mode http
-        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
-        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
-        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
-
-    frontend myfrontend
-        bind "fd@${my_fe}"
-        default_backend test
-
-    backend test
-        server www1 ${s1_addr}:${s1_port}
-} -start
-
-haproxy h1 -cli {
-    send "set server test/www1 fqdn foo.fqdn"
-    expect ~ "set server <b>/<s> fqdn failed because no resolution is configured."
-    send "show servers state test"
-    expect ~ "test 1 www1 ${s1_addr} .* - ${s1_port}"
-} -wait
diff --git a/reg-tests/server/cli_set_fqdn.vtc b/reg-tests/server/cli_set_fqdn.vtc
new file mode 100644
index 0000000..f82674f
--- /dev/null
+++ b/reg-tests/server/cli_set_fqdn.vtc
@@ -0,0 +1,57 @@
+varnishtest "Set server FQDN via CLI crash"
+
+feature ignore_unknown_macro
+
+# for "set server <srv> fqdn"
+#REGTEST_TYPE=bug
+
+# Do nothing. Is there only to create s1_* macros
+server s1 {
+} -start
+
+haproxy h1 -conf {
+    defaults
+        mode http
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
+
+    frontend myfrontend
+        bind "fd@${my_fe}"
+        default_backend test
+
+    backend test
+        server www1 ${s1_addr}:${s1_port}
+} -start
+
+haproxy h2 -conf {
+    defaults
+        mode http
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
+
+    resolvers systemdns
+        parse-resolv-conf
+
+    frontend myfrontend
+        bind "fd@${my_fe}"
+        default_backend test
+
+    backend test
+        server www1 ${s1_addr}:${s1_port} resolvers systemdns resolve-prefer ipv4
+} -start
+
+haproxy h1 -cli {
+    send "set server test/www1 fqdn foo.fqdn"
+    expect ~ "set server <b>/<s> fqdn failed because no resolution is configured."
+    send "show servers state test"
+    expect ~ "test 1 www1 ${s1_addr} .* - ${s1_port}"
+} -wait
+
+haproxy h2 -cli {
+    send "set server test/www1 fqdn localhost"
+    expect ~ "test/www1 changed its FQDN from \\(null\\) to localhost"
+    send "show servers state test"
+    expect ~ "test 1 www1 127.0.0.1 .* localhost"
+} -wait