diff --git a/everyvoice/tests/regression-test.sh b/everyvoice/tests/regression-test.sh
index 4234cb59..43faaed6 100644
--- a/everyvoice/tests/regression-test.sh
+++ b/everyvoice/tests/regression-test.sh
@@ -17,7 +17,9 @@ set -o errexit
 # Run a command, logging it first
 r() {
     cmd="$*"
-    printf "\n\n======================================\nRunning \"$cmd\"\n======================================\n"
+    printf "\n\n======================================================================\n"
+    printf 'Running "%s"\n' "$cmd"
+    printf "\n\n======================================================================\n"
     eval "$cmd" 2>&1
     rc=$?
     if [[ $rc != 0 ]]; then
@@ -35,8 +37,12 @@ LJ_SPEECH_DATASET=$HOME/tts/corpora/Speech/LJ.Speech.Dataset/LJSpeech-1.1
 export TQDM_MININTERVAL=5
 LINES_TO_USE=2000
 EVERYVOICE_ROOT=$(python -c 'import everyvoice; print(everyvoice.__path__[0])')
-DATE=$(date +'%Y%m%d')
-WORKDIR=regress-$DATE
+if [[ $SLURM_JOBID ]]; then
+    WORKDIR_SUFFIX="$SLURM_JOBID"
+else
+    WORKDIR_SUFFIX="$(date +'%Y%m%d')"
+fi
+WORKDIR=regress-"$WORKDIR_SUFFIX"
 mkdir "$WORKDIR"
 cd "$WORKDIR"