diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index f044ef8ffb5..54a065c76a3 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -9,6 +9,10 @@ EVENTSCRIPTS_PATH=""
 
 if [ -d "${TEST_SUBDIR}/stubs" ] ; then
     EVENTSCRIPTS_PATH="${TEST_SUBDIR}/stubs"
+    case "$EVENTSCRIPTS_PATH" in
+	/*) : ;;
+	*) EVENTSCRIPTS_PATH="${PWD}/${EVENTSCRIPTS_PATH}" ;;
+    esac
 fi
 
 export EVENTSCRIPTS_PATH
diff --git a/ctdb/tests/scripts/common.sh b/ctdb/tests/scripts/common.sh
index 754ea2e7e2d..287fb71fd1d 100644
--- a/ctdb/tests/scripts/common.sh
+++ b/ctdb/tests/scripts/common.sh
@@ -30,6 +30,10 @@ if [ -f "${_test_dir}/run_tests.sh" ] ; then
 fi
 
 _test_bin_dir="${TEST_BIN_DIR:-${ctdb_dir}/bin}"
+case "$_test_bin_dir" in
+    /*) : ;;
+    *) _test_bin_dir="${PWD}/${_test_bin_dir}" ;;
+esac
 if [ -d "$_test_bin_dir" ] ; then
     PATH="${_test_bin_dir}:$PATH"
 fi