diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index c9895b6f3..859b99448 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -102,7 +102,7 @@ function cleanup()
 function exit_cleanup()
 {
     echo "Running exit-cleanup"
-    if test ! -z ${POSTGRES_PATH:-}
+    if ! [[ -z ${POSTGRES_PATH:-} ]]
     then
         echo "Stopping Postgres at ${POSTGRES_PATH}"
         ${POSTGRES_PATH}/pg_ctl -D $TMPDIR -l /dev/null stop &> /dev/null || true
@@ -2050,7 +2050,7 @@ INITDB_BIN=$(command -v initdb) || true
 if [[ ! -z $INITDB_BIN ]]; then
   echo " FOUND (in path) at" $INITDB_BIN
 else
-  HAVE_INITDB=`find /usr -name "initdb" 2> /dev/null | grep postgres` || exit_skip " MISSING"
+  HAVE_INITDB=`find /usr -name "initdb" 2> /dev/null | grep postgres | head -1` || exit_skip " MISSING"
   echo " FOUND at" `dirname $HAVE_INITDB`
   INITDB_BIN=`echo $HAVE_INITDB | grep bin/initdb | grep postgres | sort -n | tail -n1`
 fi
diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh
index e21b94878..c25f15e84 100755
--- a/src/auditor/test-revocation.sh
+++ b/src/auditor/test-revocation.sh
@@ -96,7 +96,7 @@ function cleanup()
 function exit_cleanup()
 {
     echo "Running exit-cleanup"
-    if test ! -z ${POSTGRES_PATH:-}
+    if [[ ! -z ${POSTGRES_PATH:-} ]]
     then
         echo "Stopping Postgres at ${POSTGRES_PATH}"
         ${POSTGRES_PATH}/pg_ctl -D $TMPDIR -l /dev/null stop &> /dev/null || true
diff --git a/src/auditor/test-sync.sh b/src/auditor/test-sync.sh
index 174e03c6e..10a2e3f70 100755
--- a/src/auditor/test-sync.sh
+++ b/src/auditor/test-sync.sh
@@ -32,7 +32,7 @@ function exit_fail() {
 
 # Cleanup to run whenever we exit
 function cleanup() {
-    if test ! -z ${POSTGRES_PATH:-}
+    if ! [[ -z ${POSTGRES_PATH:-} ]]
     then
         ${POSTGRES_PATH}/pg_ctl -D $TMPDIR stop &> /dev/null || true
     fi