diff --git a/tests/rt.conf b/tests/rt.conf
index 382f7c982c..59083a2f23 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -297,13 +297,10 @@ RUN | datm_cdeps_lnd_era5                               | - wcoss2
 RUN | datm_cdeps_lnd_era5_rst                           | - wcoss2 noaacloud                   |          | datm_cdeps_lnd_era5
 
 ### AMIP+ tests ###
-COMPILE | s2s | intel | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + hera hercules | fv3 |
-RUN | cpld_s2s_histaux_p8                               | - wcoss2 acorn noaacloud             | baseline |
-COMPILE | atm_ds2s_docn_dice | intel | -DAPP=ATM_DS2S  -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
-RUN | atm_ds2s_docn_dice                                | - wcoss2 acorn noaacloud             | baseline |
 COMPILE | atm_ds2s_docn_pcice | intel | -DAPP=ATM_DS2S-PCICE  -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
 RUN | atm_ds2s_docn_pcice                                | - wcoss2 acorn noaacloud             | baseline |
-
+COMPILE | atm_ds2s_docn_dice | intel | -DAPP=ATM_DS2S  -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
+RUN | atm_ds2s_docn_dice                                | - wcoss2 acorn noaacloud             | baseline |
 
 ### ATM-LND tests ###
 COMPILE | atml | intel | -DAPP=ATML -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,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 |
diff --git a/tests/tests/cpld_s2s_histaux_p8 b/tests/tests/cpld_s2s_histaux_p8
deleted file mode 100644
index 2e9b00210b..0000000000
--- a/tests/tests/cpld_s2s_histaux_p8
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-#  cpld_s2s_histaux_p8 test
-#
-
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system with histaux output - C96MX100"
-
-export CNTL_DIR=cpld_s2s_histaux_p8
-
-export LIST_FILES="sfcf021.tile1.nc \
-                   sfcf021.tile2.nc \
-                   sfcf021.tile3.nc \
-                   sfcf021.tile4.nc \
-                   sfcf021.tile5.nc \
-                   sfcf021.tile6.nc \
-                   atmf021.tile1.nc \
-                   atmf021.tile2.nc \
-                   atmf021.tile3.nc \
-                   atmf021.tile4.nc \
-                   atmf021.tile5.nc \
-                   atmf021.tile6.nc \
-                   sfcf024.tile1.nc \
-                   sfcf024.tile2.nc \
-                   sfcf024.tile3.nc \
-                   sfcf024.tile4.nc \
-                   sfcf024.tile5.nc \
-                   sfcf024.tile6.nc \
-                   atmf024.tile1.nc \
-                   atmf024.tile2.nc \
-                   atmf024.tile3.nc \
-                   atmf024.tile4.nc \
-                   atmf024.tile5.nc \
-                   atmf024.tile6.nc \
-                   RESTART/20210323.060000.coupler.res \
-                   RESTART/20210323.060000.fv_core.res.nc \
-                   RESTART/20210323.060000.fv_core.res.tile1.nc \
-                   RESTART/20210323.060000.fv_core.res.tile2.nc \
-                   RESTART/20210323.060000.fv_core.res.tile3.nc \
-                   RESTART/20210323.060000.fv_core.res.tile4.nc \
-                   RESTART/20210323.060000.fv_core.res.tile5.nc \
-                   RESTART/20210323.060000.fv_core.res.tile6.nc \
-                   RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \
-                   RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \
-                   RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \
-                   RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \
-                   RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \
-                   RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \
-                   RESTART/20210323.060000.fv_tracer.res.tile1.nc \
-                   RESTART/20210323.060000.fv_tracer.res.tile2.nc \
-                   RESTART/20210323.060000.fv_tracer.res.tile3.nc \
-                   RESTART/20210323.060000.fv_tracer.res.tile4.nc \
-                   RESTART/20210323.060000.fv_tracer.res.tile5.nc \
-                   RESTART/20210323.060000.fv_tracer.res.tile6.nc \
-                   RESTART/20210323.060000.phy_data.tile1.nc \
-                   RESTART/20210323.060000.phy_data.tile2.nc \
-                   RESTART/20210323.060000.phy_data.tile3.nc \
-                   RESTART/20210323.060000.phy_data.tile4.nc \
-                   RESTART/20210323.060000.phy_data.tile5.nc \
-                   RESTART/20210323.060000.phy_data.tile6.nc \
-                   RESTART/20210323.060000.sfc_data.tile1.nc \
-                   RESTART/20210323.060000.sfc_data.tile2.nc \
-                   RESTART/20210323.060000.sfc_data.tile3.nc \
-                   RESTART/20210323.060000.sfc_data.tile4.nc \
-                   RESTART/20210323.060000.sfc_data.tile5.nc \
-                   RESTART/20210323.060000.sfc_data.tile6.nc \
-                   RESTART/20210323.060000.MOM.res.nc \
-                   RESTART/iced.2021-03-23-21600.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
-
-#TODO: add comparison of CA restart files?
-
-export_fv3
-export_cpl
-
-export RESTART_N=12
-export RESTART_INTERVAL="${RESTART_N} -1"
-export OUTPUT_FH='0 21 24'
-
-export INPES=$INPES_cpl_dflt
-export JNPES=$JNPES_cpl_dflt
-export atm_omp_num_threads=1
-export WRTTASK_PER_GROUP=$WPG_cpl_dflt
-
-OCN_tasks=$OCN_tasks_cpl_dflt
-ICE_tasks=$ICE_tasks_cpl_dflt
-export WAV_tasks=0
-
-export CICE_NPROC=$ICE_tasks
-export np2=`expr $CICE_NPROC / 2`
-export CICE_BLCKX=`expr $NX_GLB / $np2`
-export CICE_BLCKY=`expr $NY_GLB / 2`
-
-export CPLWAV=.false.
-export CPLWAV2ATM=.false.
-export MOM6_USE_WAVES=False
-export eps_imesh=2.5e-1
-
-export CPLCHM=.false.
-export DNATS=0
-export MOM6_TOPOEDITS=ufs.topo_edits_011818.nc
-export MOM6_ALLOW_LANDMASK_CHANGES=True
-
-export DIAG_TABLE=diag_table_template
-export UFS_CONFIGURE=ufs.configure.s2s.IN
-
-export FV3_RUN=cpld_control_run.IN