--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -54,9 +54,9 @@
 
 #load settings
 
-. settings.ik
+. ./settings.ik
 . $testname/settings.ik
-. support_funcs.sh
+. ./support_funcs.sh
 
 echo "Test by ${SLONYTESTER} to be summarized in ${SLONYTESTFILE}"
 
@@ -439,7 +439,7 @@
 {
 	if [ -f $mktmp/slonik.script ]; then
 #	  cat $mktmp/slonik.script >`tty`
-	  $pgbindir/slonik < $mktmp/slonik.script > $mktmp/slonik.log 2>&1
+	  slonik < $mktmp/slonik.script > $mktmp/slonik.log 2>&1
 	  if [ $? -ne 0 ]; then
 	    err 3 "Slonik error see $mktmp/slonik.log for details"
 	    cat $mktmp/slonik.log
@@ -647,7 +647,7 @@
     echo "include <${mktmp}/slonik.preamble>;" > $mktmp/wait-for-propagation.slonik
     echo "sync (ID=${onode});" >> $mktmp/wait-for-propagation.slonik
     echo "wait for event (origin=${onode},confirmed=ALL,wait on=${onode});" >> $mktmp/wait-for-propagation.slonik
-    $pgbindir/slonik < $mktmp/wait-for-propagation.slonik > $mktmp/wait-for-propagation.log 2>&1
+    slonik < $mktmp/wait-for-propagation.slonik > $mktmp/wait-for-propagation.log 2>&1
     status "...event propagated to all nodes"
 }
 diff_db()
--- a/tests/test1/generate_dml.sh
+++ b/tests/test1/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tools/start_slon.sh
+++ b/tools/start_slon.sh
@@ -11,12 +11,12 @@
 
 # shouldn't need to edit anything below this
 
-test -x "$SLON_BIN_PATH/slon" || (echo "missing slon - ${SLON_BIN_PATH}/slon"; exit 1)
-test -r "$SLON_CONF" || (echo "No slon conf file - $SLON_CONF"; exit 1)
+#test -x "$SLON_BIN_PATH/slon" || { echo "missing slon - ${SLON_BIN_PATH}/slon"; exit 1; }
+test -r "$SLON_CONF" || { echo "No slon conf file - $SLON_CONF"; exit 1; }
 
 PID_LINE=`grep pid_file $SLON_CONF | cut -d "#" -f 1 | grep "^[[:space:]]*pid_file='.*'"`
 PID_FILE=`echo $PID_LINE | cut -d "=" -f 2 | cut -d "'" -f 2`
-if [ "x$PID_FILE" == "x" ]; then
+if [ "x$PID_FILE" = "x" ]; then
     echo "pid_file not found in slon conf file - $SLON_CONF"
     exit 1
 else
@@ -34,8 +34,8 @@
 	fi
 	touch $SLON_LOG
 	test -w "$SLON_LOG" || (echo "**** SLON_LOG not writable - $SLON_LOG ****"; exit 1)
-        echo "Starting slon: $SLON_BIN_PATH/slon -f ${SLON_CONF} 1>> ${SLON_LOG} 2>&1 &"
-	$SLON_BIN_PATH/slon -f ${SLON_CONF} 1>> ${SLON_LOG} 2>&1 &
+        echo "Starting slon: slon -f ${SLON_CONF} 1>> ${SLON_LOG} 2>&1 &"
+	slon -f ${SLON_CONF} 1>> ${SLON_LOG} 2>&1 &
         ;;
   stop)
         echo "Stopping slon"
--- a/tests/testdatestyles/generate_dml.sh
+++ b/tests/testdatestyles/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testddl/generate_dml.sh
+++ b/tests/testddl/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testdeadlockddl/generate_dml.sh
+++ b/tests/testdeadlockddl/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
@@ -309,4 +309,4 @@
 	sleep 1
     done
     status "all deadlock-inducing queries running"
-}
\ No newline at end of file
+}
--- a/tests/testinherit/generate_dml.sh
+++ b/tests/testinherit/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testlargetuples/generate_dml.sh
+++ b/tests/testlargetuples/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testlistenpaths/generate_dml.sh
+++ b/tests/testlistenpaths/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testlogship/generate_dml.sh
+++ b/tests/testlogship/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testmanytables/generate_dml.sh
+++ b/tests/testmanytables/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testmergeset/generate_dml.sh
+++ b/tests/testmergeset/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testmultipaths/generate_dml.sh
+++ b/tests/testmultipaths/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testmultiplemoves/generate_dml.sh
+++ b/tests/testmultiplemoves/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testomitcopy/generate_dml.sh
+++ b/tests/testomitcopy/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testpartition/generate_dml.sh
+++ b/tests/testpartition/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testschemanames/generate_dml.sh
+++ b/tests/testschemanames/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testseqnames/generate_dml.sh
+++ b/tests/testseqnames/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testtabnames/generate_dml.sh
+++ b/tests/testtabnames/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testtruncate/generate_dml.sh
+++ b/tests/testtruncate/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
--- a/tests/testutf8/generate_dml.sh
+++ b/tests/testutf8/generate_dml.sh
@@ -1,4 +1,4 @@
-. support_funcs.sh
+. ./support_funcs.sh
 
 init_dml()
 {
