diff --git a/tests/rt.conf b/tests/rt.conf
index 6c246b18e5..935b5cc390 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -17,7 +17,6 @@ RUN     | cpld_restart_c192_p8
 
 RUN     | cpld_bmark_p8                                                                                                           | - wcoss2.intel jet.intel cheyenne.intel acorn.intel | fv3 |
 RUN     | cpld_restart_bmark_p8                                                                                                   | - wcoss2.intel jet.intel cheyenne.intel acorn.intel |     | cpld_bmark_p8
-RUN     | cpld_bmark_esmfthreads_p8                                                                                               | - wcoss2.intel jet.intel cheyenne.intel acorn.intel | fv3 |
 
 COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                         |                                         | fv3 |
 RUN     | cpld_control_noaero_p8                                                                                                  |                                         | fv3 |
diff --git a/tests/tests/cpld_bmark_esmfthreads_p8 b/tests/tests/cpld_bmark_esmfthreads_p8
deleted file mode 100644
index f3b33e65b9..0000000000
--- a/tests/tests/cpld_bmark_esmfthreads_p8
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-#  cpld_bmark_p8 test
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark P8 test"
-
-export CNTL_DIR="cpld_bmark_p8"
-
-export LIST_FILES="sfcf006.nc \
-                   atmf006.nc \
-                   GFSFLX.GrbF06 \
-                   GFSPRS.GrbF06 \
-                   gocart.inst_aod.20130401_0600z.nc4 \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc \
-                   RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2013-04-01-21600.nc \
-                   RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc \
-                   20130401.060000.out_pnt.ww3 \
-                   20130401.060000.out_grd.ww3 "
-
-export_fv3
-export_cpl
-
-export NEMS_CONFIGURE=nems.configure.cpld_esmfthreads.IN
-
-export SYEAR=2013
-export SMONTH=04
-export SDAY=01
-export SHOUR=00
-export SECS=`expr $SHOUR \* 3600`
-export BMIC=.true.
-
-export DAYS=0.25
-export FHMAX=6
-export RESTART_N=3
-export RESTART_INTERVAL="${RESTART_N} -1"
-export OUTPUT_FH="3 -1"
-export FHZERO=3
-
-export DOMAINS_STACK_SIZE=16000000
-
-export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
-
-export TASKS=$TASKS_cpl_bmrk
-export INPES=$INPES_cpl_bmrk
-export JNPES=$JNPES_cpl_bmrk
-export THRD=1
-export ATM_compute_tasks=$(( INPES * JNPES * NTILES * THRD_cpl_bmrk ))
-export WRTTASK_PER_GROUP=$(( WPG_cpl_bmrk * THRD_cpl_bmrk ))
-export WRITE_DOPOST=.true.
-export WLCLK=${WLCLK_cpl_bmrk:-$WLCLK}
-
-export OCN_tasks=$(( OCN_tasks_cpl_bmrk * OCN_thrds_cpl_bmrk ))
-export ICE_tasks=$(( ICE_tasks_cpl_bmrk * ICE_thrds_cpl_bmrk ))
-export WAV_tasks=$(( WAV_tasks_cpl_bmrk * WAV_thrds_cpl_bmrk ))
-
-export atm_omp_num_threads=$THRD_cpl_bmrk
-export chm_omp_num_threads=$atm_omp_num_threads
-export med_omp_num_threads=$atm_omp_num_threads
-export ocn_omp_num_threads=$OCN_thrds_cpl_bmrk
-export ice_omp_num_threads=$ICE_thrds_cpl_bmrk
-export wav_omp_num_threads=$WAV_thrds_cpl_bmrk
-
-# atm/ocn/ice resolution
-export ATMRES=C384
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-export OUTPUT_GRID="'gaussian_grid'"
-export ATMTILESIZE=`expr $NPX - 1`
-
-export OCNRES=025
-export ICERES=0.25
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE=$ICE_tasks
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-export WAVDOMAIN=gwes_30m
-export MESH_WAV=mesh.${WAVDOMAIN}.nc
-
-# set component and coupling timesteps
-export DT_ATMOS=300
-export DT_INNER=${DT_ATMOS}
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6=900
-export DT_THERM_MOM6=1800
-
-# nems.configure
-export coupling_interval_slow_sec=${DT_THERM_MOM6}
-export coupling_interval_fast_sec=${DT_ATMOS}
-
-# resolution dependent files
-export MOM_INPUT=MOM_input_template_${OCNRES}
-export MESHOCN_ICE=mesh.mx${OCNRES}.nc
-export CICEGRID=grid_cice_NEMS_mx${OCNRES}.nc
-export CICEMASK=kmtu_cice_NEMS_mx${OCNRES}.nc
-export CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc
-export FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc
-export MOM6_RIVER_RUNOFF=True
-export MOM6_RESTART_SETTING=r
-
-export FNALBC="'C384.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C384.facsf.tileX.nc'"
-export FNTG3C="'C384.substrate_temperature.tileX.nc'"
-export FNVEGC="'C384.vegetation_greenness.tileX.nc'"
-export FNVETC="'C384.vegetation_type.tileX.nc'"
-export FNSOTC="'C384.soil_type.tileX.nc'"
-export FNVMNC="'C384.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C384.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C384.slope_type.tileX.nc'"
-export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
-
-#BMICs do not contain NSST spinup
-export NSTF_NAME=2,1,0,0,0
-
-export CDMBWD=${CDMBWD_c384}
-
-export OUT_BEG=$RUN_BEG
-export RST_BEG=$RUN_BEG
-export RST_2_BEG=$RUN_BEG
-
-export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
index 849912afd9..f3b33e65b9 100644
--- a/tests/tests/cpld_bmark_p8
+++ b/tests/tests/cpld_bmark_p8
@@ -54,6 +54,8 @@ export LIST_FILES="sfcf006.nc \
 export_fv3
 export_cpl
 
+export NEMS_CONFIGURE=nems.configure.cpld_esmfthreads.IN
+
 export SYEAR=2013
 export SMONTH=04
 export SDAY=01
@@ -75,14 +77,22 @@ export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
 export TASKS=$TASKS_cpl_bmrk
 export INPES=$INPES_cpl_bmrk
 export JNPES=$JNPES_cpl_bmrk
-export THRD=$THRD_cpl_bmrk
-export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
+export THRD=1
+export ATM_compute_tasks=$(( INPES * JNPES * NTILES * THRD_cpl_bmrk ))
+export WRTTASK_PER_GROUP=$(( WPG_cpl_bmrk * THRD_cpl_bmrk ))
 export WRITE_DOPOST=.true.
 export WLCLK=${WLCLK_cpl_bmrk:-$WLCLK}
 
-OCN_tasks=$OCN_tasks_cpl_bmrk
-ICE_tasks=$ICE_tasks_cpl_bmrk
-WAV_tasks=$WAV_tasks_cpl_bmrk
+export OCN_tasks=$(( OCN_tasks_cpl_bmrk * OCN_thrds_cpl_bmrk ))
+export ICE_tasks=$(( ICE_tasks_cpl_bmrk * ICE_thrds_cpl_bmrk ))
+export WAV_tasks=$(( WAV_tasks_cpl_bmrk * WAV_thrds_cpl_bmrk ))
+
+export atm_omp_num_threads=$THRD_cpl_bmrk
+export chm_omp_num_threads=$atm_omp_num_threads
+export med_omp_num_threads=$atm_omp_num_threads
+export ocn_omp_num_threads=$OCN_thrds_cpl_bmrk
+export ice_omp_num_threads=$ICE_thrds_cpl_bmrk
+export wav_omp_num_threads=$WAV_thrds_cpl_bmrk
 
 # atm/ocn/ice resolution
 export ATMRES=C384
@@ -146,7 +156,3 @@ export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
 
 export FV3_RUN=cpld_control_run.IN
-
-if [[ $MACHINE_ID = cheyenne.* ]]; then
-  TPN=15
-fi
diff --git a/tests/tests/cpld_restart_bmark_p8 b/tests/tests/cpld_restart_bmark_p8
index e76c732859..c12fcf2f31 100644
--- a/tests/tests/cpld_restart_bmark_p8
+++ b/tests/tests/cpld_restart_bmark_p8
@@ -54,6 +54,8 @@ export LIST_FILES="sfcf006.nc \
 export_fv3
 export_cpl
 
+export NEMS_CONFIGURE=nems.configure.cpld_esmfthreads.IN
+
 export SYEAR=2013
 export SMONTH=04
 export SDAY=01
@@ -78,13 +80,22 @@ export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}
 export TASKS=$TASKS_cpl_bmrk
 export INPES=$INPES_cpl_bmrk
 export JNPES=$JNPES_cpl_bmrk
-export THRD=$THRD_cpl_bmrk
+export THRD=1
+export ATM_compute_tasks=$(( INPES * JNPES * NTILES * THRD_cpl_bmrk ))
+export WRTTASK_PER_GROUP=$(( WPG_cpl_bmrk * THRD_cpl_bmrk ))
 export WRITE_DOPOST=.true.
-export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
-
-OCN_tasks=$OCN_tasks_cpl_bmrk
-ICE_tasks=$ICE_tasks_cpl_bmrk
-WAV_tasks=$WAV_tasks_cpl_bmrk
+export WLCLK=${WLCLK_cpl_bmrk:-$WLCLK}
+
+export OCN_tasks=$(( OCN_tasks_cpl_bmrk * OCN_thrds_cpl_bmrk ))
+export ICE_tasks=$(( ICE_tasks_cpl_bmrk * ICE_thrds_cpl_bmrk ))
+export WAV_tasks=$(( WAV_tasks_cpl_bmrk * WAV_thrds_cpl_bmrk ))
+
+export atm_omp_num_threads=$THRD_cpl_bmrk
+export chm_omp_num_threads=$atm_omp_num_threads
+export med_omp_num_threads=$atm_omp_num_threads
+export ocn_omp_num_threads=$OCN_thrds_cpl_bmrk
+export ice_omp_num_threads=$ICE_thrds_cpl_bmrk
+export wav_omp_num_threads=$WAV_thrds_cpl_bmrk
 
 # atm/ocn/ice resolution
 export ATMRES=C384