diff --git a/tests/rt.conf b/tests/rt.conf
index 4d10729bde..8b01cfa814 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -255,7 +255,7 @@ RUN     | control_stochy | + hera cheyenne | fv3 |
 RUN     | control_ras    | + hera cheyenne | fv3 |
 RUN     | control_p8     | + hera cheyenne | fv3 |
 
-COMPILE | 36 | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON | + hera cheyenne | fv3 |
+COMPILE | 36 | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON | + hera cheyenne | fv3 |
 RUN     | rap_control                             | + hera cheyenne | fv3 |
 RUN     | rap_decomp                              | + hera cheyenne |     |
 RUN     | rap_2threads                            | + hera cheyenne |     |
@@ -268,13 +268,13 @@ RUN     | hrrr_control_2threads                   | + hera cheyenne |     |
 RUN     | hrrr_control_decomp                     | + hera cheyenne |     |
 RUN     | hrrr_control_restart                    | + hera cheyenne |     | hrrr_control
 RUN     | rrfs_v1beta                             | + hera cheyenne | fv3 |
-RUN     | rrfs_conus13km_hrrr_warm                | + hera cheyenne | fv3 |
 RUN     | rrfs_smoke_conus13km_hrrr_warm          | + hera cheyenne | fv3 |
-RUN     | rrfs_conus13km_radar_tten_warm          | + hera cheyenne | fv3 |
-RUN     | rrfs_conus13km_radar_tten_warm_2threads | + hera cheyenne |     |
+RUN     | rrfs_smoke_conus13km_hrrr_warm_2threads | + hera cheyenne |     |
+RUN     | rrfs_conus13km_hrrr_warm                | + hera cheyenne | fv3 |
+RUN     | rrfs_smoke_conus13km_radar_tten_warm    | + hera cheyenne |     |
 # These two are known to not match the control:
-#RUN     | rrfs_conus13km_radar_tten_warm_decomp   | + hera cheyenne |     |
-#RUN     | rrfs_conus13km_radar_tten_warm_restart  | + hera cheyenne |     | rrfs_conus13km_radar_tten_warm
+#RUN     | rrfs_smoke_conus13km_hrrr_warm_decomp   | + hera cheyenne |     |
+#RUN     | rrfs_smoke_conus13km_hrrr_warm_restart  | + hera cheyenne |     | rrfs_smoke_conus13km_hrrr_warm
 
 ### CCPP DEBUG tests ###
 # Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
@@ -290,6 +290,10 @@ RUN     | rrfs_v1beta_debug                    | + hera cheyenne | fv3 |
 RUN     | control_ras_debug                    | + hera cheyenne | fv3 |
 RUN     | control_stochy_debug                 | + hera cheyenne | fv3 |
 RUN     | control_debug_p8                     | + hera cheyenne | fv3 |
+RUN     | rrfs_smoke_conus13km_hrrr_warm_debug | + hera cheyenne | fv3 |
+RUN     | rrfs_smoke_conus13km_hrrr_warm_debug_2threads | + hera cheyenne |     |
+# This will run and not crash, but will not match its baseline:
+#RUN     | rrfs_smoke_conus13km_hrrr_warm_debug_decomp | + hera cheyenne |     |
 RUN     | rrfs_conus13km_hrrr_warm_debug       | + hera cheyenne | fv3 |
 RUN     | rrfs_conus13km_radar_tten_warm_debug | + hera cheyenne | fv3 |