diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 4c2d8fe6dd2..79d0ea053a4 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -29,8 +29,8 @@ else
 fi
 export CTDB_BASE
 
-export EVENTSCRIPTS_TESTS_VAR_DIR="${TEST_SUBDIR}/var"
-if [ "$EVENTSCRIPTS_TESTS_VAR_DIR" != "/var" ] ; then
+export EVENTSCRIPTS_TESTS_VAR_DIR="${TEST_VAR_DIR}/unit_eventscripts"
+if [ "$EVENTSCRIPTS_TESTS_VAR_DIR" != "/unit_eventscripts" ] ; then
     rm -r "$EVENTSCRIPTS_TESTS_VAR_DIR"
 fi
 mkdir -p "$EVENTSCRIPTS_TESTS_VAR_DIR"
@@ -67,11 +67,6 @@ setup_generic ()
     for i in $(seq 1 3) ; do
 	_s="${EVENTSCRIPTS_TESTS_VAR_DIR}/shares/${i}_existing"
 	mkdir -p "$_s"
-	# Shares must begin with /
-	case "$_s" in
-	    /*) : ;;
-	    *) _s="${PWD}/$_s"
-	esac
 	FAKE_SHARES="${FAKE_SHARES}${FAKE_SHARES:+ }${_s}"
     done
 
diff --git a/ctdb/tests/onnode/scripts/local.sh b/ctdb/tests/onnode/scripts/local.sh
index 35fd013540f..9973a555633 100644
--- a/ctdb/tests/onnode/scripts/local.sh
+++ b/ctdb/tests/onnode/scripts/local.sh
@@ -23,7 +23,7 @@ fi
 
 export CTDB_NODES_FILE
 
-export ONNODE_TESTS_VAR_DIR="${TEST_SUBDIR}/var"
+export ONNODE_TESTS_VAR_DIR="${TEST_VAR_DIR}/unit_onnode"
 mkdir -p "$ONNODE_TESTS_VAR_DIR"
 
 if [ -z "$CTDB_BASE" ] ; then