diff --git a/suites/marginal/multiclient/tasks/fsx-mpi-cfuse.yaml b/suites/marginal/multiclient/tasks/fsx-mpi-cfuse.yaml
index 3561b72aafe..abaddc8fca1 100644
--- a/suites/marginal/multiclient/tasks/fsx-mpi-cfuse.yaml
+++ b/suites/marginal/multiclient/tasks/fsx-mpi-cfuse.yaml
@@ -4,16 +4,16 @@ tasks:
 - ceph-fuse:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/fsx-mpi.c
       - mpicc fsx-mpi.c -o fsx-mpi 
       - rm fsx-mpi.c
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/fsx-mpi 1MB -N 50000 -p 10000 -l 1048576
-    workdir: /tmp/cephtest/gmnt
+    exec: $TESTDIR/fsx-mpi 1MB -N 50000 -p 10000 -l 1048576
+    workdir: $TESTDIR/gmnt
 - pexec:
     all:
-      - rm /tmp/cephtest/gmnt
-      - rm /tmp/cephtest/fsx-mpi
+      - rm $TESTDIR/gmnt
+      - rm $TESTDIR/fsx-mpi
diff --git a/suites/marginal/multiclient/tasks/fsx-mpi-kclient.yaml b/suites/marginal/multiclient/tasks/fsx-mpi-kclient.yaml
index 1c592a9c11d..dd3d8c28d19 100644
--- a/suites/marginal/multiclient/tasks/fsx-mpi-kclient.yaml
+++ b/suites/marginal/multiclient/tasks/fsx-mpi-kclient.yaml
@@ -4,16 +4,16 @@ tasks:
 - kclient:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/fsx-mpi.c
       - mpicc fsx-mpi.c -o fsx-mpi 
       - rm fsx-mpi.c
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/fsx-mpi 1MB -N 50000 -p 10000 -l 1048576
-    workdir: /tmp/cephtest/gmnt
+    exec: $TESTDIR/fsx-mpi 1MB -N 50000 -p 10000 -l 1048576
+    workdir: $TESTDIR/gmnt
 - pexec:
     all:
-      - rm /tmp/cephtest/gmnt
-      - rm /tmp/cephtest/fsx-mpi
+      - rm $TESTDIR/gmnt
+      - rm $TESTDIR/fsx-mpi
diff --git a/suites/marginal/multiclient/tasks/ior-shared-file-cfuse.yaml b/suites/marginal/multiclient/tasks/ior-shared-file-cfuse.yaml
index e791add5fde..21d840bcb13 100644
--- a/suites/marginal/multiclient/tasks/ior-shared-file-cfuse.yaml
+++ b/suites/marginal/multiclient/tasks/ior-shared-file-cfuse.yaml
@@ -4,21 +4,21 @@ tasks:
 - ceph-fuse:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/ior.tbz2
       - tar xvfj ior.tbz2
       - cd ior
       - ./configure
       - make
-      - make install DESTDIR=/tmp/cephtest/binary/
-      - cd /tmp/cephtest/
+      - make install DESTDIR=$TESTDIR/binary/
+      - cd $TESTDIR/
       - rm ior.tbz2
       - rm -r ior
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/binary/usr/local/bin/ior -e -w -r -W -b 10m -a POSIX -o /tmp/cephtest/gmnt/ior.testfile
+    exec: $TESTDIR/binary/usr/local/bin/ior -e -w -r -W -b 10m -a POSIX -o $TESTDIR/gmnt/ior.testfile
 - pexec:
     all:
-      - rm -f /tmp/cephtest/gmnt/ior.testfile
-      - rm -f /tmp/cephtest/gmnt
+      - rm -f $TESTDIR/gmnt/ior.testfile
+      - rm -f $TESTDIR/gmnt
diff --git a/suites/marginal/multiclient/tasks/ior-shared-file-kclient.yaml b/suites/marginal/multiclient/tasks/ior-shared-file-kclient.yaml
index 5df13da7d34..12d09df9dd7 100644
--- a/suites/marginal/multiclient/tasks/ior-shared-file-kclient.yaml
+++ b/suites/marginal/multiclient/tasks/ior-shared-file-kclient.yaml
@@ -4,21 +4,21 @@ tasks:
 - kclient:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/ior.tbz2
       - tar xvfj ior.tbz2
       - cd ior
       - ./configure
       - make
-      - make install DESTDIR=/tmp/cephtest/binary/
-      - cd /tmp/cephtest/
+      - make install DESTDIR=$TESTDIR/binary/
+      - cd $TESTDIR/
       - rm ior.tbz2
       - rm -r ior
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/binary/usr/local/bin/ior -e -w -r -W -b 10m -a POSIX -o /tmp/cephtest/gmnt/ior.testfile
+    exec: $TESTDIR/binary/usr/local/bin/ior -e -w -r -W -b 10m -a POSIX -o $TESTDIR/gmnt/ior.testfile
 - pexec:
     all:
-      - rm -f /tmp/cephtest/gmnt/ior.testfile
-      - rm -f /tmp/cephtest/gmnt
+      - rm -f $TESTDIR/gmnt/ior.testfile
+      - rm -f $TESTDIR/gmnt
diff --git a/suites/marginal/multiclient/tasks/mdtest-cfuse.yaml b/suites/marginal/multiclient/tasks/mdtest-cfuse.yaml
index 93a074b5f09..48cb3d7ab7c 100644
--- a/suites/marginal/multiclient/tasks/mdtest-cfuse.yaml
+++ b/suites/marginal/multiclient/tasks/mdtest-cfuse.yaml
@@ -4,18 +4,18 @@ tasks:
 - ceph-fuse:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/mdtest-1.8.4.tgz
       - tar xvfz mdtest-1.8.4.tgz
-      - rm /tmp/cephtest/mdtest-1.8.4.tgz
+      - rm $TESTDIR/mdtest-1.8.4.tgz
       - cd mdtest-1.8.4
       - make
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/mdtest-1.8.4/mdtest -d /tmp/cephtest/gmnt -I 20 -z 5 -b 2 -R
+    exec: $TESTDIR/mdtest-1.8.4/mdtest -d $TESTDIR/gmnt -I 20 -z 5 -b 2 -R
 - pexec:
     all:
-      - rm -f /tmp/cephtest/gmnt
-      - rm -rf /tmp/cephtest/mdtest-1.8.4
-      - rm -rf /tmp/cephtest/._mdtest-1.8.4
+      - rm -f $TESTDIR/gmnt
+      - rm -rf $TESTDIR/mdtest-1.8.4
+      - rm -rf $TESTDIR/._mdtest-1.8.4
diff --git a/suites/marginal/multiclient/tasks/mdtest-kclient.yaml b/suites/marginal/multiclient/tasks/mdtest-kclient.yaml
index 729bbd1af38..d18b4bde94c 100644
--- a/suites/marginal/multiclient/tasks/mdtest-kclient.yaml
+++ b/suites/marginal/multiclient/tasks/mdtest-kclient.yaml
@@ -4,18 +4,18 @@ tasks:
 - kclient:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/mdtest-1.8.4.tgz
       - tar xvfz mdtest-1.8.4.tgz
-      - rm /tmp/cephtest/mdtest-1.8.4.tgz
+      - rm $TESTDIR/mdtest-1.8.4.tgz
       - cd mdtest-1.8.4
       - make
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/mdtest-1.8.4/mdtest -d /tmp/cephtest/gmnt -I 20 -z 5 -b 2 -R
+    exec: $TESTDIR/mdtest-1.8.4/mdtest -d $TESTDIR/gmnt -I 20 -z 5 -b 2 -R
 - pexec:
     all:
-      - rm -f /tmp/cephtest/gmnt
-      - rm -rf /tmp/cephtest/mdtest-1.8.4
-      - rm -rf /tmp/cephtest/._mdtest-1.8.4
+      - rm -f $TESTDIR/gmnt
+      - rm -rf $TESTDIR/mdtest-1.8.4
+      - rm -rf $TESTDIR/._mdtest-1.8.4