diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index d0cca1a0b3..818fb462e4 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -273,6 +273,7 @@ Caveats:
       <value compset="_BGC%BDRD"   >diagnostic</value>
       <value compset="_BGC%BPRP"   >prognostic</value>
       <value compset="HIST.*_DATM" >diagnostic</value>
+      <value compset="DATM%CPLHIST_CLM60" >diagnostic</value>
       <value compset="SSP.*_DATM"  >diagnostic</value>
     </values>
     <group>run_component_ctsm</group>
@@ -307,6 +308,7 @@ Caveats:
     <default_value>FALSE</default_value>
     <values>
       <value compset="_CAM" >TRUE</value>
+      <value compset="1850_DATM%[^_]_CLM60">TRUE</value>
     </values>
     <group>run_component_ctsm</group>
     <file>env_run.xml</file>
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index a49f2a46b9..223c3c2a42 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -532,6 +532,12 @@
     <lname>1850_DATM%CPLHIST_CLM60%BGC-CROP_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>I1850Clm60BgcCropSpinup</alias>
+    <lname>1850_DATM%CPLHIST_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+  </compset>
+
+
 <!-- I CLM50 NWP Compsets -->
 
   <!-- GSWP datm forcing, for global runs or regional runs outside the CONUS -->
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index e19e5cb131..b80a18937c 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -2516,7 +2516,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/cplhist--clm/matrixcnOn">
+  <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/default--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -2524,7 +2524,7 @@
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment">Repeat last SMS_D_Ld1...cplhist test with matrixcnOn"</option>
+      <option name="comment">Repeat last SMS_D_Ld1...Spinup test with matrixcnOn"</option>
     </options>
   </test>
   <test name="SMS_D_Ld1_PS" grid="f19_f19_mg17" compset="I2010Clm50Sp" testmods="clm/clm50cam6LndTuningMode--clm/nofireemis">
diff --git a/cime_config/testdefs/testmods_dirs/clm/cplhist/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/cplhist/include_user_mods
deleted file mode 100644
index fe0e18cf88..0000000000
--- a/cime_config/testdefs/testmods_dirs/clm/cplhist/include_user_mods
+++ /dev/null
@@ -1 +0,0 @@
-../default
diff --git a/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands b/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands
deleted file mode 100755
index f0eb85010b..0000000000
--- a/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands
+++ /dev/null
@@ -1,8 +0,0 @@
-./xmlchange DATM_CPLHIST_CASE=cam6ctsm51_cesm23a12c_ne30pg3g17_CPLHIST_1850
-./xmlchange DATM_CPLHIST_DIR='$DIN_LOC_ROOT/atm/datm7/atm_forcing.cdeps_datm.CPLHIST_cam6ctsm51_cesm23a12c_ne30pg3g17_1850'
-./xmlchange DATM_YR_START=1
-./xmlchange DATM_YR_END=1
-./xmlchange DATM_YR_ALIGN=1
-
-# Needed until we have cplhist forcing with ndep - see https://github.com/escomp/ctsm/issues/1844
-./xmlchange DATM_PRESNDEP=none