diff --git a/configure.ac b/configure.ac
index 09d57ab0f2..1de3081522 100755
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_SUBST([PACKAGE_URL])
 PACKAGE_FULLNAME="FRRouting"
 AC_SUBST([PACKAGE_FULLNAME])
 
-CONFIG_ARGS="$ac_configure_args"
+CONFIG_ARGS="`echo $ac_configure_args | sed -e \"s% '[[A-Z]]*FLAGS=[[^']]\+'%%g\"`"
 AC_SUBST([CONFIG_ARGS])
 
 AC_CONFIG_SRCDIR([lib/zebra.h])
diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 3cf30f00c3..393b588745 100644
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -80,6 +80,7 @@ int main(int argc, char **argv)
 	/* Library inits. */
 	cmd_init(1);
 	cmd_hostname_set("test");
+	cmd_domainname_set("test.domain");
 
 	vty_init(master);
 	memory_init();
diff --git a/tests/lib/cli/test_cli.refout.in b/tests/lib/cli/test_cli.refout.in
index af8f9ce56a..8f9959cc47 100644
--- a/tests/lib/cli/test_cli.refout.in
+++ b/tests/lib/cli/test_cli.refout.in
@@ -311,6 +311,7 @@ frr version @PACKAGE_VERSION@
 frr defaults @DFLT_NAME@
 !
 hostname test
+domainname test.domain
 !
 !
 !
@@ -327,6 +328,7 @@ frr version @PACKAGE_VERSION@
 frr defaults @DFLT_NAME@
 !
 hostname foohost
+domainname test.domain
 !
 !
 !