diff --git a/source/script/tests/runtests.sh b/source/script/tests/runtests.sh
index bb599ea3ecb..a5dc3ecfb4a 100644
--- a/source/script/tests/runtests.sh
+++ b/source/script/tests/runtests.sh
@@ -28,7 +28,7 @@ PASSWORD=test
 
 SRCDIR=`pwd`
 SCRIPTDIR=$SRCDIR/script/tests
-TMPDIR=$PREFIX_ABS/tmp
+SHRDIR=$PREFIX_ABS/tmp
 LIBDIR=$PREFIX_ABS/lib
 PIDDIR=$PREFIX_ABS/pid
 CONFFILE=$LIBDIR/smb.conf
@@ -40,7 +40,7 @@ CONFIGURATION="-s $CONFFILE"
 PATH=`pwd`/bin:$PATH
 
 export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
-export PRIVATEDIR LIBDIR PIDDIR LOCKDIR TMPDIR LOGDIR
+export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR
 export SRCDIR SCRIPTDIR
 export USERNAME PASSWORD
 
@@ -62,8 +62,7 @@ fi
 ##
 
 /bin/rm -rf $PREFIX/*
-mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR
-chmod 1777 $TMPDIR
+mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR $SOCKET_WRAPPER_DIR
 
 ##
 ## Create the common config include file with the basic settings
diff --git a/source/script/tests/t_001.sh b/source/script/tests/t_001.sh
index 995cfb11eb4..6d54d0e4895 100644
--- a/source/script/tests/t_001.sh
+++ b/source/script/tests/t_001.sh
@@ -8,7 +8,7 @@ cat >$CONFFILE<<EOF
 	smb ports = 139
 
 [test]
-	path = $TMPDIR
+	path = $PREFIX_ABS/tmp
 	read only = no
 EOF
 
@@ -16,6 +16,10 @@ EOF
 ## Test code 
 ##
 
+/bin/rm -rf $PREFIX_ABS/tmp
+mkdir $PREFIX_ABS/tmp
+chmod 1777 $PREFIX_ABS/tmp
+
 start_smbd || exit $?
 
 smbclient $CONFIGURATION -L localhost -N -p 139
diff --git a/source/script/tests/t_002.sh b/source/script/tests/t_002.sh
index 48987262a73..42070bed80a 100644
--- a/source/script/tests/t_002.sh
+++ b/source/script/tests/t_002.sh
@@ -7,7 +7,7 @@ cat >$CONFFILE<<EOF
 	include = $LIBDIR/common.conf
 
 [test]
-	path = $TMPDIR
+	path = $PREFIX_ABS/tmp
 	read only = no
 EOF
 
@@ -15,6 +15,11 @@ EOF
 ## Test code 
 ##
 
+/bin/rm -rf $PREFIX_ABS/tmp
+mkdir $PREFIX_ABS/tmp
+chmod 1777 $PREFIX_ABS/tmp
+
+
 start_smbd || exit $?
 
 smbtorture //localhost/test -U${USERNAME}%${PASSWORD} FDPASS