diff --git a/test/test_install.sh b/test/test_install.sh
index 7bc4612e..5ee1e0f4 100755
--- a/test/test_install.sh
+++ b/test/test_install.sh
@@ -27,12 +27,18 @@ if [ ! -f $dir/usr/local/share/clixon/clixon-config* ]; then
     err $dir/usr/local/share/clixon/clixon-config*
 fi
 new "Check installed files libclixon.so"
+# Check both /usr/local/lib and /usr/lib 
+# This is a problem on some platforms that dont have /usr/local/ in LD_LIBRARY_PATH
 if [ ! -h $dir/usr/local/lib/libclixon.so ]; then
-    err $dir/usr/local/lib/libclixon.so
+    if [ ! -h $dir/usr/lib/libclixon.so ]; then
+	err $dir/usr/local/lib/libclixon.so
+    fi
 fi
 new "Check installed files libclixon_backend.so"
 if [ ! -h $dir/usr/local/lib/libclixon_backend.so ]; then
-    err $dir/usr/local/lib/libclixon_backend.so
+    if [ ! -h $dir/usr/lib/libclixon_backend.so ]; then
+	err $dir/usr/local/lib/libclixon_backend.so
+    fi
 fi
 
 new "Make DESTDIR install include"
diff --git a/test/test_nacm_credentials.sh b/test/test_nacm_credentials.sh
index 36597d7b..c470a380 100755
--- a/test/test_nacm_credentials.sh
+++ b/test/test_nacm_credentials.sh
@@ -10,8 +10,8 @@
 # Magic line must be first in script (see README.md)
 s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
 
-# Raw unit tester of backend unix socket
-: ${clixon_util_socket:=clixon_util_socket}
+# Raw unit tester of backend unix socket.
+: ${clixon_util_socket:=$(which clixon_util_socket)}
 
 APPNAME=example