diff --git a/.gitmodules b/.gitmodules
index 8e3701bb2b..ec20eeca66 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,5 +40,5 @@
   branch = develop
 [submodule "CDEPS"]
   path = CDEPS-interface/CDEPS
-  url = https://github.com/NOAA-EMC/CDEPS
-  branch = emc/develop
+  url = https://github.com/binli2337/CDEPS
+  branch = feature/data_files
diff --git a/CDEPS-interface/CDEPS b/CDEPS-interface/CDEPS
index dc5c15ca9b..250cab14d6 160000
--- a/CDEPS-interface/CDEPS
+++ b/CDEPS-interface/CDEPS
@@ -1 +1 @@
-Subproject commit dc5c15ca9bcb407934c0b7c9ad391d1668d9cbea
+Subproject commit 250cab14d62e941134ec9e468c50fba815ec5cc9
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 4a1e10c3ea..43aef5be80 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -912,6 +912,7 @@ export FILENAME_BASE='cfsr.'
 export mesh_file="cfsr_mesh.nc"
 export MESH_ATM="DATM_INPUT/${mesh_file}"
 export atm_datamode=${DATM_SRC}
+export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
 
 # MOM6 defaults; 1 degree
 export MOM_INPUT=MOM_input_template_100
diff --git a/tests/parm/datm.streams.IN b/tests/parm/datm.streams.IN
index c6fec635a9..be6dead039 100644
--- a/tests/parm/datm.streams.IN
+++ b/tests/parm/datm.streams.IN
@@ -3,7 +3,7 @@ taxmode01:                 cycle
 mapalgo01:                 bilinear
 tInterpAlgo01:             linear
 readMode01:                single
-dtlimit01:                 1.5
+dtlimit01:                 1.0
 stream_offset01:           0
 yearFirst01:               2011
 yearLast01:                2011
@@ -11,5 +11,5 @@ yearAlign01:               2011
 stream_vectors01:          "u:v"
 stream_mesh_file01:        @[MESH_ATM]
 stream_lev_dimname01:      null
-stream_data_files01:       "DATM_INPUT/@[FILENAME_BASE]201110.nc"
+stream_data_files01:       @[stream_files]
 stream_data_variables01:  "slmsksfc Sa_mask" "DSWRF Faxa_swdn" "DLWRF Faxa_lwdn" "vbdsf_ave Faxa_swvdr" "vddsf_ave Faxa_swvdf" "nbdsf_ave Faxa_swndr" "nddsf_ave Faxa_swndf" "u10m Sa_u10m" "v10m Sa_v10m" "hgt_hyblev1 Sa_z" "psurf Sa_pslv" "tmp_hyblev1 Sa_tbot" "spfh_hyblev1 Sa_shum" "ugrd_hyblev1 Sa_u" "vgrd_hyblev1 Sa_v" "q2m Sa_q2m" "t2m Sa_t2m" "pres_hyblev1 Sa_pbot" "precp Faxa_rain" "fprecp Faxa_snow"
diff --git a/tests/rt.conf b/tests/rt.conf
index bdd649ffe6..adcfe8e0e7 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -201,6 +201,8 @@ RUN     | datm_cdeps_bulk_gefs
 RUN     | datm_cdeps_mx025_cfsr                                                                                                   | - wcoss_cray  gaea.intel                | fv3 |
 RUN     | datm_cdeps_mx025_gefs                                                                                                   | - wcoss_cray                            | fv3 |
 
+RUN     | datm_cdeps_multiple_files_cfsr                                                                                          | - wcoss_cray                            | fv3 |
+
 COMPILE | APP=DATM DEBUG=Y                                                                                                        | - wcoss_cray                            | fv3 |
 RUN     | datm_cdeps_debug_cfsr                                                                                                   | - wcoss_cray                            | fv3 |
 
diff --git a/tests/tests/datm_cdeps_bulk_gefs b/tests/tests/datm_cdeps_bulk_gefs
index 8116b148e8..137ea518a6 100644
--- a/tests/tests/datm_cdeps_bulk_gefs
+++ b/tests/tests/datm_cdeps_bulk_gefs
@@ -22,6 +22,7 @@ export DATM_SRC="GEFS"
 export FILENAME_BASE='gefs.'
 export mesh_file="gefs_mesh.nc"
 export MESH_ATM="DATM_INPUT/${mesh_file}"
+export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
 
 export RESTART_N=12
 export flux_scheme='-1'
diff --git a/tests/tests/datm_cdeps_control_gefs b/tests/tests/datm_cdeps_control_gefs
index 3de9c937c7..3f5b045482 100644
--- a/tests/tests/datm_cdeps_control_gefs
+++ b/tests/tests/datm_cdeps_control_gefs
@@ -23,5 +23,6 @@ export DATM_SRC="GEFS"
 export FILENAME_BASE='gefs.'
 export mesh_file="gefs_mesh.nc"
 export MESH_ATM="DATM_INPUT/${mesh_file}"
+export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
 export RESTART_N=12
 export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_multiple_files_cfsr b/tests/tests/datm_cdeps_multiple_files_cfsr
new file mode 100644
index 0000000000..ec8c2ea788
--- /dev/null
+++ b/tests/tests/datm_cdeps_multiple_files_cfsr
@@ -0,0 +1,18 @@
+#
+#  DATM_CDEPS_MOM6_CICE_CMEPS_CFSR test
+#
+
+export TEST_DESCR="DATM_CDEPS-MOM6-CICE-CMEPS_CFSR - multiple input files "
+
+export CNTL_DIR="datm_cdeps_control_cfsr"
+
+export LIST_FILES="RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc"
+
+export_datm_cdeps
+export DATM_SRC="CFSR"
+export FILENAME_BASE='cfsr.'
+export IATM=1760
+export JATM=880
+export RESTART_N=12
+export stream_files="DATM_INPUT/cfsr.2011100100.nc DATM_INPUT/cfsr.2011100106.nc DATM_INPUT/cfsr.2011100112.nc DATM_INPUT/cfsr.2011100118.nc DATM_INPUT/cfsr.2011100200.nc"
+export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_mx025_gefs b/tests/tests/datm_cdeps_mx025_gefs
index 2cfffe5d31..082229a115 100644
--- a/tests/tests/datm_cdeps_mx025_gefs
+++ b/tests/tests/datm_cdeps_mx025_gefs
@@ -26,6 +26,7 @@ export DATM_SRC="GEFS"
 export FILENAME_BASE='gefs.'
 export mesh_file="gefs_mesh.nc"
 export MESH_ATM="DATM_INPUT/${mesh_file}"
+export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
 
 export TASKS=$TASKS_cdeps_025
 export TPN=$TPN_cdeps_025