diff --git a/test/config.sh.in b/test/config.sh.in
index bc3950ea..0eb2ce48 100755
--- a/test/config.sh.in
+++ b/test/config.sh.in
@@ -81,5 +81,6 @@ CFLAGS="@CFLAGS@"
 LINKAGE=@LINKAGE@
 SH_SUFFIX=@SH_SUFFIX@
 LIBSTATIC_SUFFIX=@LIBSTATIC_SUFFIX@
+LIBS="@LIBS@"
 CLIXON_YANG_PATCH=@CLIXON_YANG_PATCH@
 YANG_STANDARD_DIR=@YANG_STANDARD_DIR@
diff --git a/test/test_client.sh b/test/test_client.sh
index ed37410c..279b95fc 100755
--- a/test/test_client.sh
+++ b/test/test_client.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 # Advanced Client api test
 # Compile and run a client
+# INSTALLFLSAGS="" 
 
 # Magic line must be first in script (see README.md)
 s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
@@ -114,7 +115,13 @@ main(int    argc,
 EOF
 
 new "compile $cfile -> $app"
-expectpart "$($CC -g -Wall -I/usr/local/include $cfile -o $app -L /usr/local/lib -lclixon)" 0 ""
+if [ "$LINKAGE" = static ]; then
+    COMPILE="$CC ${CFLAGS} -I/usr/local/include $cfile -o $app /usr/local/lib/libclixon${LIBSTATIC_SUFFIX} ${LIBS}"
+else
+    COMPILE="$CC ${CFLAGS} -I/usr/local/include $cfile -o $app -L /usr/local/lib -lclixon"
+fi
+echo "COMPILE:$COMPILE"
+expectpart "$($COMPILE)" 0 ""
 
 new "test params: -s init -f $cfg"