diff --git a/tests/rt.conf b/tests/rt.conf
index 73aa884e04..db9f993354 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -52,8 +52,14 @@ RUN | cpld_control_c192_p8                              | - wcoss2 jet acorn s4
 RUN | cpld_restart_c192_p8                              | - wcoss2 jet acorn s4 noaacloud      |          | cpld_control_c192_p8
 
 COMPILE | s2swa | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 | | fv3 |
-RUN | cpld_bmark_gefs                                   | - noaacloud                          | baseline |
-RUN | cpld_restart_bmark_gefs                           | - noaacloud                          |          | cpld_bmark_gefs
+RUN | cpld_control_gefs                                 | - noaacloud                          | baseline |
+RUN | cpld_restart_gefs                                 | - noaacloud                          |          | cpld_control_gefs
+RUN | cpld_dcp_gefs                                     | - noaacloud                          | baseline |
+
+COMPILE | s2swa_debug | intel | -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 | | fv3 |
+RUN | cpld_debug_gefs                                   | - noaacloud                          | baseline |
+COMPILE | s2swa_debug | gnu   | -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 | | fv3 |
+RUN | cpld_debug_gefs                                   | - noaacloud                          | baseline |
 
 # Aerosol, no Wave
 RUN | cpld_s2sa_p8                                      | - noaacloud                          | baseline |