diff --git a/Makefile.am b/Makefile.am
index 20aaa19d..b957edbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -278,6 +278,9 @@ EXTRA_DIST = \
     test/conf/ofb_mode_access.conf \
     test/conf/open_ports_access.conf \
     test/conf/override_fwknopd.conf \
+    test/conf/override2_fwknopd.conf \
+    test/conf/var_expansion_fwknopd.conf \
+    test/conf/var_expansion_invalid_fwknopd.conf \
     test/conf/require_src_access.conf \
     test/conf/require_user_access.conf \
     test/conf/subnet_source_match_access.conf \
diff --git a/test/conf/override2_fwknopd.conf b/test/conf/override2_fwknopd.conf
new file mode 100644
index 00000000..16cce60a
--- /dev/null
+++ b/test/conf/override2_fwknopd.conf
@@ -0,0 +1,2 @@
+ENABLE_PCAP_PROMISC     N
+PCAP_FILTER             udp port 1234
diff --git a/test/conf/override_fwknopd.conf b/test/conf/override_fwknopd.conf
index 6f826c9a..64d71f7b 100644
--- a/test/conf/override_fwknopd.conf
+++ b/test/conf/override_fwknopd.conf
@@ -1 +1,2 @@
 ENABLE_PCAP_PROMISC     Y;
+PCAP_FILTER             udp port 3456
diff --git a/test/conf/var_expansion_fwknopd.conf b/test/conf/var_expansion_fwknopd.conf
new file mode 100644
index 00000000..d69e98d7
--- /dev/null
+++ b/test/conf/var_expansion_fwknopd.conf
@@ -0,0 +1,2 @@
+FWKNOP_RUN_DIR              /var/run
+FWKNOP_PID_FILE             $FWKNOP_RUN_DIR/test.pid
diff --git a/test/conf/var_expansion_invalid_fwknopd.conf b/test/conf/var_expansion_invalid_fwknopd.conf
new file mode 100644
index 00000000..f8f1d320
--- /dev/null
+++ b/test/conf/var_expansion_invalid_fwknopd.conf
@@ -0,0 +1,2 @@
+FWKNOP_RUN_DIR              /var/run
+FWKNOP_PID_FILE             $FWKNOP_INVALID_VAR/test.pid
diff --git a/test/tests/basic_operations.pl b/test/tests/basic_operations.pl
index 3129a1c7..6362af66 100644
--- a/test/tests/basic_operations.pl
+++ b/test/tests/basic_operations.pl
@@ -17,6 +17,36 @@
         'cmdline' => "$fwknopdCmd $default_server_conf_args " .
             "-O $conf_dir/override_fwknopd.conf --dump-config",
     },
+    {
+        'category' => 'basic operations',
+        'detail'   => 'multiple override configs',
+        'function' => \&generic_exec,
+        'positive_output_matches' => [qr/ENABLE_PCAP_PROMISC.*\'N\'/,
+            qr/FILTER.*1234/],
+        'exec_err' => $NO,
+        'cmdline' => "$fwknopdCmd -c $cf{'def'} -d $default_digest_file " .
+            "-p $default_pid_file --dump-config " .
+            "-O $conf_dir/override_fwknopd.conf,$conf_dir/override2_fwknopd.conf",
+    },
+    {
+        'category' => 'basic operations',
+        'detail'   => 'config var expansion',
+        'function' => \&generic_exec,
+        'positive_output_matches' => [qr/test\.pid/],
+        'exec_err' => $NO,
+        'cmdline' => "$fwknopdCmd -c $conf_dir/var_expansion_fwknopd.conf " .
+            "-d $default_digest_file --dump-config "
+    },
+    {
+        'category' => 'basic operations',
+        'detail'   => 'invalid config var expansion',
+        'function' => \&generic_exec,
+        'positive_output_matches' => [qr/Invalid embedded/],
+        'exec_err' => $NO,
+        'cmdline' => "$fwknopdCmd -c $conf_dir/var_expansion_invalid_fwknopd.conf " .
+            "-d $default_digest_file --dump-config "
+    },
+
     {
         'category' => 'basic operations',
         'subcategory' => 'server',