diff --git a/Makefile.am b/Makefile.am
index 737d84d0..0f03d101 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,7 +138,8 @@ EXTRA_DIST = \
     test/conf/default_fwknopd.conf \
     test/conf/portrange_fwknopd.conf \
     test/conf/prepend_fwknopd.conf \
-    test/conf/no_nat_dns_fwknopd.conf \
+    test/conf/firewd_no_nat_dns_fwknopd.conf \
+    test/conf/ipt_no_nat_dns_fwknopd.conf \
     test/conf/ipt_custom_input_chain_fwknopd.conf \
     test/conf/firewd_custom_input_chain_fwknopd.conf \
     test/conf/ipt_custom_nat_chain_fwknopd.conf \
diff --git a/test/conf/no_nat_dns_fwknopd.conf b/test/conf/firewd_no_nat_dns_fwknopd.conf
similarity index 71%
rename from test/conf/no_nat_dns_fwknopd.conf
rename to test/conf/firewd_no_nat_dns_fwknopd.conf
index 88c12e9b..c92eec5b 100644
--- a/test/conf/no_nat_dns_fwknopd.conf
+++ b/test/conf/firewd_no_nat_dns_fwknopd.conf
@@ -1,3 +1,4 @@
 # default config - no variables set to allow defaults to be preserved
 
+ENABLE_FIREWD_FORWARDING           Y;
 ENABLE_NAT_DNS         N;
diff --git a/test/conf/ipt_no_nat_dns_fwknopd.conf b/test/conf/ipt_no_nat_dns_fwknopd.conf
new file mode 100644
index 00000000..c92eec5b
--- /dev/null
+++ b/test/conf/ipt_no_nat_dns_fwknopd.conf
@@ -0,0 +1,4 @@
+# default config - no variables set to allow defaults to be preserved
+
+ENABLE_FIREWD_FORWARDING           Y;
+ENABLE_NAT_DNS         N;
diff --git a/test/test-fwknop.pl b/test/test-fwknop.pl
index c694c207..9305c1a1 100755
--- a/test/test-fwknop.pl
+++ b/test/test-fwknop.pl
@@ -435,7 +435,7 @@ our %cf = (
     'include_def_hmac_access'      => "$conf_dir/include_def_hmac_access.conf",
     'include_keys1_hmac_access'    => "$conf_dir/include_keys1_hmac_access.conf",
     'prepend_fwknopd'              => "$conf_dir/prepend_fwknopd.conf",
-    'no_nat_dns_fwknopd'           => "$conf_dir/no_nat_dns_fwknopd.conf",
+    "${fw_conf_prefix}_no_nat_dns_fwknopd" => "$conf_dir/${fw_conf_prefix}_no_nat_dns_fwknopd.conf",
     'hmac_cmd_access'              => "$conf_dir/hmac_cmd_access.conf",
     'hmac_cmd_setuid_access'       => "$conf_dir/hmac_cmd_setuid_access.conf",
     'hmac_cmd_giduid_access'       => "$conf_dir/hmac_cmd_giduid_access.conf",
diff --git a/test/tests/rijndael_hmac.pl b/test/tests/rijndael_hmac.pl
index 95127f84..254d2a41 100644
--- a/test/tests/rijndael_hmac.pl
+++ b/test/tests/rijndael_hmac.pl
@@ -1629,13 +1629,14 @@
         'function' => \&spa_cycle,
         'cmdline'  => "$default_client_args_no_get_key --rc-file " .
             "$cf{'rc_hmac_b64_key'} -N somehost:22",
-        'fwknopd_cmdline' => qq/$fwknopdCmd -c $cf{'no_nat_dns_fwknopd'} -a $cf{'hmac_open_ports_access'} / .
+        'fwknopd_cmdline' => qq/$fwknopdCmd -c $cf{"${fw_conf_prefix}_no_nat_dns_fwknopd"} -a $cf{'hmac_open_ports_access'} / .
             "-d $default_digest_file -p $default_pid_file $intf_str",
         'server_positive_output_matches' => [
-            qr/requested NAT.*\snot enabled/],
+            qr/NAT SPA message, but hostname is disabled/
+        ],
         'fw_rule_created' => $REQUIRE_NO_NEW_RULE,
         'key_file' => $cf{'rc_hmac_b64_key'},
-        'server_conf' => $cf{'no_nat_dns_fwknopd'}
+        'server_conf' => $cf{"${fw_conf_prefix}_no_nat_dns_fwknopd"}
     },
 
     {