diff --git a/sorc/test/hera_ctest.sh b/sorc/test/hera_ctest.sh
index cb2b8fbe..06cad79a 100755
--- a/sorc/test/hera_ctest.sh
+++ b/sorc/test/hera_ctest.sh
@@ -4,7 +4,8 @@
 set -eux
 
 source ../../versions/build.ver_hera
-module use ../../modulefiles && module load build_hera_intel
+module use ../../modulefiles
+module load build_hera_intel
 
 ctest
 
diff --git a/sorc/test/orion_ctest.sh b/sorc/test/orion_ctest.sh
index 44863672..94885d9b 100755
--- a/sorc/test/orion_ctest.sh
+++ b/sorc/test/orion_ctest.sh
@@ -4,7 +4,8 @@
 set -eux
 
 source ../../versions/build.ver_orion
-module use ../../modulefiles && module load build_orion_intel
+module use ../../modulefiles
+module load build_orion_intel
 
 ctest
 
diff --git a/sorc/test/run_hera_ctest.sh b/sorc/test/run_hera_ctest.sh
index ad8f0307..647668dd 100755
--- a/sorc/test/run_hera_ctest.sh
+++ b/sorc/test/run_hera_ctest.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 set -eux
 
-JOB_ID=$(sbatch --job-name=ctest --account=nems --qos=debug --ntasks-per-node=6 --nodes=1 --time=00:30:00 ./hera_ctest.sh | awk '{print $4}')
+JOB_ID=$(sbatch --job-name=ctest --account=nems --qos=debug --ntasks-per-node=7 --nodes=1 --time=00:30:00 ./hera_ctest.sh | awk '{print $4}')
 
 CHECK_ID=$(sbatch --job-name=ctest --account=nems --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh)
 
-sleep 3m
+sleep 5m
 
 if [ -f out.ctest ]; then
     cat out.ctest
diff --git a/sorc/test/run_orion_ctest.sh b/sorc/test/run_orion_ctest.sh
index dfc12290..4ba17d41 100755
--- a/sorc/test/run_orion_ctest.sh
+++ b/sorc/test/run_orion_ctest.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 set -eux
 
-JOB_ID=$(sbatch --job-name=ctest --account=epic --qos=debug --ntasks-per-node=6 --nodes=1 --time=00:30:00 ./orion_ctest.sh | awk '{print $4}')
+JOB_ID=$(sbatch --job-name=ctest --account=nems --qos=batch --ntasks-per-node=7 --nodes=1 --time=02:00:00 ./orion_ctest.sh | awk '{print $4}')
 
-CHECK_ID=$(sbatch --job-name=ctest --account=epic --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh)
+CHECK_ID=$(sbatch --job-name=ctest --account=nems --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh)
 
-sleep 3m
+sleep 30m
 
 if [ -f out.ctest ]; then
     cat out.ctest