diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index a852543f8c..f628414af2 100644
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -1168,7 +1168,7 @@ export_ww3() {
   export WW3_PIO_FORMAT='pnetcdf'
   export WW3_PIO_STRIDE=4
   export WW3_PIO_IOTASKS=-99
-  export WW3_PIO_REARR='subset'
+  export WW3_PIO_REARR='box'
   export WW3_PIO_ROOT=-99
 }
 
@@ -1614,7 +1614,7 @@ export_hafs_regional ()
   export WW3_PIO_FORMAT='pnetcdf'
   export WW3_PIO_STRIDE=4
   export WW3_PIO_IOTASKS=-99
-  export WW3_PIO_REARR='subset'
+  export WW3_PIO_REARR='box'
   export WW3_PIO_ROOT=-99
 
   # Set CMEPS component defaults
diff --git a/tests/tests/atmwav_control_noaero_p8 b/tests/tests/atmwav_control_noaero_p8
index a552ae6534..a1d7c8bc42 100644
--- a/tests/tests/atmwav_control_noaero_p8
+++ b/tests/tests/atmwav_control_noaero_p8
@@ -89,7 +89,7 @@ export WW3_restart_from_binary='false'
 export WW3_PIO_FORMAT='pnetcdf'
 export WW3_PIO_STRIDE=4
 export WW3_PIO_IOTASKS=-99
-export WW3_PIO_REARR='subset'
+export WW3_PIO_REARR='box'
 export WW3_PIO_ROOT=-99
 
 # ufs.configure
@@ -207,7 +207,3 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 export SATMEDMF=.true.
-
-if [[ $MACHINE_ID = gaea ]]; then
- WAV_tasks="$(($WAV_tasks_cpl_atmw + 30))"
-fi
\ No newline at end of file
diff --git a/tests/tests/cpld_debug_pdlib_p8 b/tests/tests/cpld_debug_pdlib_p8
index 298625d259..65e815477a 100644
--- a/tests/tests/cpld_debug_pdlib_p8
+++ b/tests/tests/cpld_debug_pdlib_p8
@@ -76,7 +76,7 @@ OCN_tasks=$OCN_tasks_cpl_unstr
 ICE_tasks=$ICE_tasks_cpl_unstr
 WAV_tasks=$WAV_tasks_cpl_unstr
 # bump resources for debug test
-WAV_tasks="$(($WAV_tasks_cpl_unstr + 18))"
+WAV_tasks="$(($WAV_tasks_cpl_unstr + 30))"
 OCN_tasks="$((OCN_tasks_cpl_unstr + 16))"
 
 export atm_omp_num_threads=$THRD_cpl_unstr
@@ -111,13 +111,6 @@ fi
 if [[ $MACHINE_ID = gaea ]] && [[ $RT_COMPILER = intelllvm ]]; then
   WLCLK=50
 fi
-if [[ $MACHINE_ID = hercules && $RT_COMPILER = gnu ]]; then
- export WW3_PIO_REARR='box'
-fi
-if [[ $MACHINE_ID = gaea ]]; then
- WAV_tasks="$(($WAV_tasks_cpl_unstr + 120))"
- export WW3_PIO_REARR='box'
-fi
 
 export K_SPLIT=2
 export N_SPLIT=5