diff --git a/tests/rt.conf b/tests/rt.conf
index cf40a41994..4d10729bde 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -1,5 +1,5 @@
 ### ATM tests ###
-COMPILE | 1 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0 -D32BIT=ON | | fv3 |
+COMPILE | 1 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0, FV3_GFS_v17_p8_mynn -D32BIT=ON | | fv3 |
 RUN     | control_CubedSphereGrid          |                | fv3 |
 RUN     | control_CubedSphereGrid_parallel | - wcoss2 acorn | fv3 |
 RUN     | control_latlon                   |                | fv3 |
@@ -19,6 +19,7 @@ RUN     | control_restart_p8               |                |     | control_p8
 RUN     | control_decomp_p8                |                |     |
 RUN     | control_2threads_p8              |                |     |
 RUN     | control_p8_rrtmgp                |                | fv3 |
+RUN     | control_p8_mynn                  |                | fv3 |
 RUN     | merra2_thompson                  |                | fv3 |
 RUN     | regional_control                 |                | fv3 |
 RUN     | regional_restart                 |                |     | regional_control
@@ -51,17 +52,13 @@ RUN     | hrrr_control_restart                    | |     | hrrr_control
 RUN     | rrfs_v1beta                             | | fv3 |
 RUN     | rrfs_v1nssl                             | | fv3 |
 RUN     | rrfs_v1nssl_nohailnoccn                 | | fv3 |
-RUN     | rrfs_conus13km_hrrr_warm                | | fv3 |
 RUN     | rrfs_smoke_conus13km_hrrr_warm          | | fv3 |
-RUN     | rrfs_conus13km_radar_tten_warm          | | fv3 |
-# The following do not match the control yet:
-# RUN     | rrfs_conus13km_hrrr_warm_decomp       | |     |
-# RUN     | rrfs_conus13km_radar_tten_warm_decomp | |     |
-RUN     | rrfs_conus13km_hrrr_warm_2threads       | |     |
-RUN     | rrfs_conus13km_radar_tten_warm_2threads | |     |
-# The following do not match the control yet:
-# RUN     | rrfs_conus13km_hrrr_warm_restart      | |     | rrfs_conus13km_hrrr_warm
-# RUN     | rrfs_conus13km_radar_tten_warm_restart| |     | rrfs_conus13km_radar_tten_warm
+RUN     | rrfs_smoke_conus13km_hrrr_2threads      | |     |
+RUN     | rrfs_conus13km_hrrr_warm                | | fv3 |
+RUN     | rrfs_smoke_conus13km_radar_tten_warm    | | fv3 |
+# These two should run and not crash, but they do not match their baselines::
+#RUN     | rrfs_smoke_conus13km_hrrr_warm_decomp   | |     |
+#RUN     | rrfs_smoke_conus13km_hrrr_warm_restart  | |     | rrfs_smoke_conus13km_hrrr_warm
 
 COMPILE | 4 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp | | fv3 |
 RUN     | control_csawmg  | - gaea | fv3 |
@@ -78,8 +75,11 @@ RUN     | regional_control_faster | | fv3 |
 
 ### ATM DEBUG tests ###
 COMPILE | 7 | intel | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_HRRR,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta | | fv3 |
+RUN     | rrfs_smoke_conus13km_hrrr_warm_debug         | | fv3 |
+RUN     | rrfs_smoke_conus13km_hrrr_warm_debug_2threads | |     |
 RUN     | rrfs_conus13km_hrrr_warm_debug         | | fv3 |
-RUN     | rrfs_conus13km_radar_tten_warm_debug   | | fv3 |
+# This should run and not crash, but does not match its baseline
+#RUN     | rrfs_smoke_conus13km_hrrr_warm_debug_decomp | |     |
 RUN     | control_CubedSphereGrid_debug          | | fv3 |
 RUN     | control_wrtGauss_netcdf_parallel_debug | | fv3 |
 RUN     | control_stochy_debug                   | | fv3 |