diff --git a/regression/regression_param.sh b/regression/regression_param.sh
index 2dafba05e..4e356c1e3 100755
--- a/regression/regression_param.sh
+++ b/regression/regression_param.sh
@@ -115,8 +115,8 @@ case $regtest in
            topts[1]="0:15:00" ; popts[1]="40/3/"  ; ropts[1]="/1"
            topts[2]="0:15:00" ; popts[2]="40/5/"  ; ropts[2]="/1"
         elif [[ "$machine" = "gaeac6" ]]; then
-           topts[1]="0:60:00" ; popts[1]="40/3/"  ; ropts[1]="/1"
-           topts[2]="0:60:00" ; popts[2]="40/5/"  ; ropts[2]="/1"
+           topts[1]="0:15:00" ; popts[1]="40/3/"  ; ropts[1]="/1"
+           topts[2]="0:15:00" ; popts[2]="40/5/"  ; ropts[2]="/1"
         elif [[ "$machine" = "wcoss2" || "$machine" = "acorn" ]]; then
            topts[1]="0:15:00" ; popts[1]="64/1/" ; ropts[1]="/1"
            topts[2]="0:15:00" ; popts[2]="128/2/" ; ropts[2]="/1"
diff --git a/regression/regression_var.sh b/regression/regression_var.sh
index 5e6c8e38d..f30869849 100755
--- a/regression/regression_var.sh
+++ b/regression/regression_var.sh
@@ -68,6 +68,7 @@ case $machine in
 
     export check_resource="no"
     export accnt="ufs-ard"
+    export FI_VERBS_PREFER_XRC=0
   ;;
   gaeac6)
     export queue="normal"
diff --git a/ush/sub_gaeac5 b/ush/sub_gaeac5
index 98317f2e6..2ed9affe5 100755
--- a/ush/sub_gaeac5
+++ b/ush/sub_gaeac5
@@ -158,7 +158,6 @@ sbatch=${sbatch:-sbatch}
 ofile=$DATA/subout$$
 >$ofile
 chmod 777 $ofile
-export FI_VERBS_PREFER_XRC=0
 $sbatch  $cfile >$ofile
 rc=$?
 cat $ofile