diff --git a/tests/compile.sh b/tests/compile.sh
index 567c80c756..284fb51cc0 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -58,8 +58,8 @@ if [[ $MACHINE_ID == macosx ]] || [[ $MACHINE_ID == linux ]]; then
   source $PATHTR/modulefiles/ufs_${MACHINE_ID}.${RT_COMPILER}
 else
   # Activate lua environment for gaea c5
-  if [[ $MACHINE_ID == gaea-c5 ]]; then
-    source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh
+  if [[ $MACHINE_ID == gaea ]]; then
+    module reset
   fi
   # Load fv3 module
   module use $PATHTR/modulefiles
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index b12407a31d..e0783bdafc 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -216,7 +216,7 @@ elif [[ $MACHINE_ID = s4 ]]; then
   ICE_tasks_cpl_bmrk=48
   WAV_tasks_cpl_bmrk=80
 
-elif [[ $MACHINE_ID = gaea-c5 ]]; then
+elif [[ $MACHINE_ID = gaea ]]; then
 
   TPN=128
 
diff --git a/tests/fv3_conf/compile_slurm.IN_gaea-c5 b/tests/fv3_conf/compile_slurm.IN_gaea
similarity index 100%
rename from tests/fv3_conf/compile_slurm.IN_gaea-c5
rename to tests/fv3_conf/compile_slurm.IN_gaea
diff --git a/tests/fv3_conf/fv3_slurm.IN_gaea-c5 b/tests/fv3_conf/fv3_slurm.IN_gaea
similarity index 100%
rename from tests/fv3_conf/fv3_slurm.IN_gaea-c5
rename to tests/fv3_conf/fv3_slurm.IN_gaea
diff --git a/tests/module-setup.sh b/tests/module-setup.sh
index de149ba320..f392a6c084 100755
--- a/tests/module-setup.sh
+++ b/tests/module-setup.sh
@@ -65,8 +65,8 @@ elif [[ $MACHINE_ID = stampede ]] ; then
     fi
     module purge
 
-elif [[ $MACHINE_ID = gaea-c5 ]] ; then
-    # We are on GAEA C5
+elif [[ $MACHINE_ID = gaea ]] ; then
+    # We are on GAEA
     if ( ! eval module help > /dev/null 2>&1 ) ; then
         # We cannot simply load the module command.  The GAEA
         # /etc/profile modifies a number of module-related variables
diff --git a/tests/rt.sh b/tests/rt.sh
index 187ef462a7..040aeadce6 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -313,9 +313,11 @@ elif [[ $MACHINE_ID = gaea-c5 ]]; then
   ROCOTOCOMPLETE=$(which rocotocomplete)
   ROCOTO_SCHEDULER=slurm
 
+  
   module load PrgEnv-intel/8.3.3
-  module load intel-classic/2023.1.0
   module load cray-mpich/8.1.25
+  module load intel-classic/2023.1.0
+  module use /ncrc/proj/epic/spack-stack/modulefiles
   module load python/3.9.12
   module use /ncrc/proj/epic/spack-stack/modulefiles
   module load ecflow/5.8.4
@@ -657,7 +659,7 @@ if [[ $ROCOTO == true ]]; then
     QUEUE=main
     COMPILE_QUEUE=main
     ROCOTO_SCHEDULER=pbspro
-  elif [[ $MACHINE_ID = gaea-c5 ]]; then
+  elif [[ $MACHINE_ID = gaea ]]; then
     QUEUE=normal
     COMPILE_QUEUE=normal
     ROCOTO_SCHEDULER=slurm
diff --git a/tests/run_test.sh b/tests/run_test.sh
index 2b9e3ebf9d..ac565d8268 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -97,7 +97,7 @@ cp ${PATHTR}/modulefiles/ufs_common*                 ./modulefiles/.
 cp ${PATHRT}/module-setup.sh                       module-setup.sh
 
 # load nccmp module
-if [[ " s4 hera orion hercules gaea-c5 jet derecho acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
+if [[ " s4 hera orion hercules gaea jet derecho acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
   if [[ " wcoss2 acorn " =~ " ${MACHINE_ID} " ]] ; then
     module load intel/19.1.3.304 netcdf/4.7.4
     module load nccmp
@@ -106,7 +106,7 @@ if [[ " s4 hera orion hercules gaea-c5 jet derecho acorn wcoss2 " =~ " $MACHINE_
     module load stack-intel/2021.5.0 stack-intel-oneapi-mpi/2021.5.0
     module load miniconda/3.9.12
     module load nccmp/1.9.0.1
-  elif [[ " hera orion hercules gaea-c5 jet " =~ " ${MACHINE_ID} " ]] ; then
+  elif [[ " hera orion hercules gaea jet " =~ " ${MACHINE_ID} " ]] ; then
     module use modulefiles
     module load modules.fv3
   else