diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
index 7dd4fc2f1d..ed613f8204 100644
--- a/tests/rt_gnu.conf
+++ b/tests/rt_gnu.conf
@@ -61,9 +61,8 @@ RUN     | control_wam_debug
 # S2S tests                                                                                                                                                      #
 ##################################################################################################################################################################
 
-# Waves off
-COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                          |                | fv3         |
-RUN     | cpld_control_c96_noaero_p8                                                                                              |                | fv3         |
+COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                         |                | fv3         |
+RUN     | cpld_control_noaero_p8                                                                                                  |                | fv3         |
 
-COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                               |                | fv3         |
+COMPILE | -DAPP=S2SW -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                              |                | fv3         |
 RUN     | cpld_debug_noaero_p8                                                                                                    |                | fv3         |
diff --git a/tests/tests/cpld_control_c96_noaero_p8 b/tests/tests/cpld_control_noaero_p8
similarity index 97%
rename from tests/tests/cpld_control_c96_noaero_p8
rename to tests/tests/cpld_control_noaero_p8
index 1b6262ba53..f710709568 100644
--- a/tests/tests/cpld_control_c96_noaero_p8
+++ b/tests/tests/cpld_control_noaero_p8
@@ -1,10 +1,10 @@
 #
-#  cpld_control C96 noaero P8 test
+#  cpld_control noaero P8 test
 #
 
 export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100"
 
-export CNTL_DIR="cpld_control_c96_noaero_p8"
+export CNTL_DIR="cpld_control_noaero_p8"
 
 export LIST_FILES="sfcf021.tile1.nc \
                    sfcf021.tile2.nc \