diff --git a/regression/scripts/common.sh b/regression/scripts/common.sh
index 70142e18ab..a731fce975 100644
--- a/regression/scripts/common.sh
+++ b/regression/scripts/common.sh
@@ -168,7 +168,9 @@ function selectscratchdir
 {
   # TOSS, CLE, BGQ, Darwin:
   toss2_yellow_scratchdirs="lustre/scratch2/yellow lustre/scratch3/yellow"
+  toss2_red_scratchdirs="lustre/scratch3 lustre/scratch4"
   cray_yellow_scratchdirs="lustre/ttscratch"
+  cray_red_scratchdirs="lustre/trscratch1 lustre/trscratch2"
   bgq_scratchdirs="nfs/tmp2"
   scratchdirs="$toss2_yellow_scratchdirs $toss2_red_scratchdirs \
 $cray_yellow_scratchdirs $cray_red_scratchdirs $bgq_scratchdirs \
diff --git a/regression/scripts/release_cray.sh b/regression/scripts/release_cray.sh
index c192f212d7..87c014ffb9 100755
--- a/regression/scripts/release_cray.sh
+++ b/regression/scripts/release_cray.sh
@@ -34,7 +34,7 @@ pdir=$ddir
 # release for each module set
 target="`uname -n | sed -e s/[.].*//`"
 case $target in
-  t[rt]-fey* | t[rt]-login* )
+  t[rt]-fe* | t[rt]-login* )
     environments="intel16env" ;;
 esac
 function intel16env()
@@ -189,7 +189,7 @@ for env in $environments; do
 
     # Run the tests on the back-end.
     export steps="test"
-    cmd="msub -V $access_queue -l walltime=08:00:00 -l nodes=8:ppn=${ppn} -j oe \
+    cmd="msub -V $access_queue -l walltime=08:00:00 -l nodes=2:ppn=${ppn} -j oe \
 -o $source_prefix/logs/release-$buildflavor-$version-t.log $draco_script_dir/release_cray.msub"
     echo -e "\nTest $package for $buildflavor-$version."
     echo "$cmd"
diff --git a/regression/scripts/release_toss2.sh b/regression/scripts/release_toss2.sh
index 42884b280c..ff24d05b33 100755
--- a/regression/scripts/release_toss2.sh
+++ b/regression/scripts/release_toss2.sh
@@ -30,9 +30,6 @@ export package=draco
 ddir=draco-6_20_0
 pdir=$ddir
 
-# CMake options that will be included in the configuration step
-export CONFIG_BASE="-DDRACO_VERSION_PATCH=0"
-
 # environment (use draco modules)
 # release for each module set
 environments="intel16env"
@@ -74,6 +71,9 @@ export draco_script_dir=$script_dir
 cd $cdir
 source $draco_script_dir/common.sh
 
+# CMake options that will be included in the configuration step
+export CONFIG_BASE="-DDRACO_VERSION_PATCH=`echo $ddir | sed -e 's/.*_//'`"
+
 # sets umask 0002
 # sets $install_group, $install_permissions, $build_permissions
 establish_permissions