diff --git a/bot/test.sh b/bot/test.sh
index d3f3630ea8..820618b477 100755
--- a/bot/test.sh
+++ b/bot/test.sh
@@ -130,7 +130,7 @@ echo "bot/test.sh: LOAD_MODULES='${LOAD_MODULES}'"
 # singularity/apptainer settings: CONTAINER, HOME, TMPDIR, BIND
 CONTAINER=$(cfg_get_value "repository" "container")
 export SINGULARITY_HOME="${PWD}:/eessi_bot_job"
-export SINGULARITY_TMPDIR="${PWD}/singularity_tmpdir"
+export SINGULARITY_TMPDIR="${JOB_STORAGE:-${PWD}}/singularity_tmpdir"
 mkdir -p ${SINGULARITY_TMPDIR}
 
 # load modules if LOAD_MODULES is not empty