diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 627f1d54d0..bf3f9effc7 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -70,21 +70,19 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <hist_empty_htapes clm_accelerated_spinup="on"  >.true.</hist_empty_htapes>
 <hist_empty_htapes clm_accelerated_spinup="sasu">.true.</hist_empty_htapes>
 <hist_fincl1 clm_accelerated_spinup="on" use_cn=".true." use_cndv=".true."
->'TOTECOSYSC','TOTECOSYSN','TOTSOMC','TOTSOMN','TOTVEGC','TOTVEGN','TLAI','GPP','NPP','TWS','TSAI','HTOP','HBOT'</hist_fincl1>
+>'TOTECOSYSC','TOTECOSYSN','TOTSOMC','TOTSOMN','TOTVEGC','TOTVEGN','TLAI','GPP','NPP','TWS','TSAI','HTOP','HBOT','H2OSNO'</hist_fincl1>
 <hist_fincl1 clm_accelerated_spinup="on" use_cn=".true."
->'TOTECOSYSC','TOTECOSYSN','TOTSOMC','TOTSOMN','TOTVEGC','TOTVEGN','TLAI','GPP','CPOOL','NPP','TWS'</hist_fincl1>
+>'TOTECOSYSC','TOTECOSYSN','TOTSOMC','TOTSOMN','TOTVEGC','TOTVEGN','TLAI','GPP','CPOOL','NPP','TWS','H2OSNO'</hist_fincl1>
 <hist_fincl1 clm_accelerated_spinup="on" use_fates=".true."
->'TOTSOMC','TOTSOMN','TLAI','GPP','NPP','TWS'</hist_fincl1>
+>'TOTSOMC','TOTSOMN','TLAI','GPP','NPP','TWS','H2OSNO'</hist_fincl1>
 <hist_fincl1 clm_accelerated_spinup="on" use_cn=".false."
->'TLAI','TWS'</hist_fincl1>
+>'TLAI','TWS','H2OSNO'</hist_fincl1>
 <hist_fincl1 clm_accelerated_spinup="sasu" use_cn=".true." use_cndv=".true."
->'TOTECOSYSC','TOTECOSYSN','TOTSOMC','TOTSOMN','TOTVEGC','TOTVEGN','TLAI','GPP','NPP','TWS','TSAI','HTOP','HBOT'</hist_fincl1>
+>'TOTECOSYSC','TOTECOSYSN','TOTSOMC','TOTSOMN','TOTVEGC','TOTVEGN','TLAI','GPP','NPP','TWS','TSAI','HTOP','HBOT','H2OSNO'</hist_fincl1>
 <hist_fincl1 clm_accelerated_spinup="sasu" use_cn=".true."
->'TOTECOSYSC','TOTECOSYSN','TOTSOMC','TOTSOMN','TOTVEGC','TOTVEGN','TLAI','GPP','CPOOL','NPP','TWS'</hist_fincl1>
+>'TOTECOSYSC','TOTECOSYSN','TOTSOMC','TOTSOMN','TOTVEGC','TOTVEGN','TLAI','GPP','CPOOL','NPP','TWS','H2OSNO'</hist_fincl1>
 <hist_fincl1 clm_accelerated_spinup="sasu" use_fates=".true."
->'TOTSOMC','TOTSOMN','TLAI','GPP','NPP','TWS'</hist_fincl1>
-<hist_fincl1 clm_accelerated_spinup="sasu" use_cn=".false."
->'TLAI','TWS'</hist_fincl1>
+>'TOTSOMC','TOTSOMN','TLAI','GPP','NPP','TWS','H2OSNO'</hist_fincl1>
 <hist_nhtfrq clm_accelerated_spinup="on"  >-8760</hist_nhtfrq>
 <hist_nhtfrq clm_accelerated_spinup="sasu">-8760</hist_nhtfrq>
 <hist_mfilt  clm_accelerated_spinup="on"  >20</hist_mfilt>
diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
index d21fc39c42..f7f4e8ba24 100644
--- a/cime_config/testdefs/ExpectedTestFails.xml
+++ b/cime_config/testdefs/ExpectedTestFails.xml
@@ -29,13 +29,6 @@
 
 
   <!-- ctsm_sci test suite failures -->
-  <test name="ERP_D_Ld3_PS.f09_g17.I2000Clm50Sp.derecho_intel.clm-prescribed">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#3529</issue>
-      <comment>We will generate new fsurdat files with the new raw lai file to resolve this issue.</comment>
-    </phase>
-  </test>
   <test name="SMS_Ld12_Mmpi-serial.1x1_urbanc_alpha.I1PtClm60SpRs.derecho_intel.clm-output_sp_highfreq">
     <phase name="RUN">
       <status>FAIL</status>
@@ -69,12 +62,6 @@
   </test>
 
   <!-- aux_clm test suite failures -->
-  <test name="ERP_D_Ld9.f10_f10_mg37.I1850Clm60BgcCrop.izumi_nag.clm-clm60cam7LndTuningModeLDust">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#3495</issue>
-    </phase>
-  </test>
   <test name="MKSURFDATAESMF_P128x1.f10_f10_mg37.I1850Clm50BgcCrop.derecho_intel">
     <phase name="NLCOMP">
       <status>FAIL</status>
@@ -338,22 +325,6 @@
     </phase>
   </test>
 
-  <test name="LII2FINIDATAREAS_D_P256x2_Ld1.f09_t232.I1850Clm60BgcCrop.derecho_intel.clm-default">
-    <phase name="COMPARE_base_no_interp">
-      <status>FAIL</status>
-      <issue>#3252</issue>
-      <comment>This should be resolved for the 5.4 release.</comment>
-    </phase>
-  </test>
-
-  <test name="LII2FINIDATAREAS_D_P256x2_Ld1.f09_t232.I1850Clm60BgcCrop.derecho_intel.clm-default--clm-matrixcnOn_ignore_warnings">
-    <phase name="COMPARE_base_no_interp">
-      <status>FAIL</status>
-      <issue>#3252</issue>
-      <comment>This should be resolved for the 5.4 release.</comment>
-    </phase>
-  </test>
-
   <!-- Other submodule test list failures (MOSART, RTM, etc. -->
 
   <test name="SMS_Lh3.f10_f10_mg37.I2000Clm60Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">
diff --git a/cime_config/testdefs/testmods_dirs/clm/smallville_dynlakes_monthly/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/smallville_dynlakes_monthly/user_nl_clm
index 6223cc203f..46680fd36d 100644
--- a/cime_config/testdefs/testmods_dirs/clm/smallville_dynlakes_monthly/user_nl_clm
+++ b/cime_config/testdefs/testmods_dirs/clm/smallville_dynlakes_monthly/user_nl_clm
@@ -6,7 +6,7 @@ do_transient_lakes = .true.
 ! Key points are that lake area starts as 0, increases after the first year, then decreases after the second year.
 ! PCT_CROP is also changed so that PCT_LAKE + PCT_CROP <= 100. (Here, PCT_CROP increases and decreases at the same time as PCT_LAKE in order to exercise the simultaneous increase or decrease of two landunits, but that isn't a critical part of this test.)
 ! Note that the use of this file means that this testmod can only be used with the 1x1_smallvilleIA grid.
-flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.3.0/synthetic/landuse.timeseries_1x1_smallvilleIA_synth_SSP2-4.5_1850-1855_78pfts_dynLakes_c240912.nc'
+flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.4.0/synthetic/landuse.timeseries_1x1_smallvilleIA_synth_1850-1855_78pfts_dynLakes_c251023.nc'
 
 ! NOTE slevis (2024/2/23) Adding option for tests to pass. In the long term
 ! ensure that subset_data generates fsurdat and landuse files consistent with
diff --git a/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/user_nl_clm
index 958265cffc..bb18638158 100644
--- a/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/user_nl_clm
+++ b/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/user_nl_clm
@@ -7,7 +7,7 @@ do_transient_urban = .true.
 ! Medium density urban is set to zero to test the memory-saving behavior of PCT_URBAN_MAX.
 ! PCT_CROP is also changed so that PCT_URBAN + PCT_CROP <= 100. (Here, PCT_CROP increases and decreases at the same time as PCT_URBAN in order to exercise the simultaneous increase or decrease of two landunits, but that isn't a critical part of this test.)
 ! Note that the use of this file means that this testmod can only be used with the 1x1_smallvilleIA grid.
-flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.3.0/synthetic/landuse.timeseries_1x1_smallvilleIA_synth_SSP2-4.5_1850-1855_78pfts_dynUrban_c240912.nc'
+flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.4.0/synthetic/landuse.timeseries_1x1_smallvilleIA_synth_1850-1855_78pfts_dynUrban_c251023.nc'
 
 ! NOTE slevis (2024/2/23) Adding option for tests to pass. In the long term
 ! ensure that subset_data generates fsurdat and landuse files consistent with
diff --git a/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_clm
index 5216afb381..ff20dae0b4 100644
--- a/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_clm
+++ b/cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_clm
@@ -19,6 +19,6 @@
 !----------------------------------------------------------------------------------
 
 flanduse_timeseries = ' '   ! This isn't needed for a non transient case, but will be once we start using transient compsets
-fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/ctsm5.3.0/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_2000_16pfts_c240912.nc"
+fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/ctsm5.4.0/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_2000_16pfts_c251023.nc"
 
 ! custom namelist changes for each site / case
diff --git a/python/ctsm/test/testinputs/default_data.cfg b/python/ctsm/test/testinputs/default_data.cfg
index 60c012561c..a220a0ee90 100644
--- a/python/ctsm/test/testinputs/default_data.cfg
+++ b/python/ctsm/test/testinputs/default_data.cfg
@@ -15,16 +15,16 @@ precname = CLMCRUJRA2024.Precip
 tpqwname = CLMCRUJRA2024.TPQW
 
 [surfdat]
-dir = lnd/clm2/surfdata_esmf/ctsm5.3.0
-surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c240908.nc
-surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c240908.nc
+dir = lnd/clm2/surfdata_esmf/ctsm5.4.0
+surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c251022.nc
+surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c251022.nc
 mesh_dir = share/meshes/
 mesh_surf = fv0.9x1.25_141008_ESMFmesh.nc
 
 [landuse]
-dir = lnd/clm2/surfdata_esmf/ctsm5.3.0
-landuse_16pft = landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc
-landuse_78pft = landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc
+dir = lnd/clm2/surfdata_esmf/ctsm5.4.0
+landuse_16pft = landuse.timeseries_0.9x1.25_hist_1850-2023_16pfts_c251022.nc
+landuse_78pft = landuse.timeseries_0.9x1.25_hist_1850-2023_78pfts_c251022.nc
 
 [domain]
 file = share/domains/domain.lnd.fv0.9x1.25_gx1v7.151020.nc
diff --git a/python/ctsm/test/testinputs/default_data_gswp3.cfg b/python/ctsm/test/testinputs/default_data_gswp3.cfg
index 09e1463eb2..a7da53cea3 100644
--- a/python/ctsm/test/testinputs/default_data_gswp3.cfg
+++ b/python/ctsm/test/testinputs/default_data_gswp3.cfg
@@ -15,16 +15,16 @@ precname = CLMGSWP3v1.Precip
 tpqwname = CLMGSWP3v1.TPQW
 
 [surfdat]
-dir = lnd/clm2/surfdata_esmf/ctsm5.3.0
-surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c240908.nc
-surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c240908.nc
+dir = lnd/clm2/surfdata_esmf/ctsm5.4.0
+surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c251022.nc
+surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c251022.nc
 mesh_dir = share/meshes/
 mesh_surf = fv0.9x1.25_141008_ESMFmesh.nc
 
 [landuse]
-dir = lnd/clm2/surfdata_esmf/ctsm5.3.0
-landuse_16pft = landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc
-landuse_78pft = landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc
+dir = lnd/clm2/surfdata_esmf/ctsm5.4.0
+landuse_16pft = landuse.timeseries_0.9x1.25_hist_1850-2023_16pfts_c251022.nc
+landuse_78pft = landuse.timeseries_0.9x1.25_hist_1850-2023_78pfts_c251022.nc
 
 [domain]
 file = share/domains/domain.lnd.fv0.9x1.25_gx1v7.151020.nc