diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
index 009381e754..c708bc3863 100644
--- a/tests/fv3_conf/cpld_control_run.IN
+++ b/tests/fv3_conf/cpld_control_run.IN
@@ -130,7 +130,8 @@ else
 
      # WAVE restart file
      if [[ $CPLWAV == .true. ]]; then
-       cp ../${DEP_RUN}${SUFFIX}/${RESTART_FILE_PREFIX}.restart.ww3 ./restart.ww3
+       RFILE=ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS}
+       cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
      fi
 
   else
diff --git a/tests/parm/nems.configure.cpld.IN b/tests/parm/nems.configure.cpld.IN
index 3f4da44a0f..7cce5c1784 100644
--- a/tests/parm/nems.configure.cpld.IN
+++ b/tests/parm/nems.configure.cpld.IN
@@ -74,6 +74,7 @@ WAV_attributes::
   logfile = wav.log
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # CMEPS warm run sequence
diff --git a/tests/parm/nems.configure.cpld_esmfthreads.IN b/tests/parm/nems.configure.cpld_esmfthreads.IN
index 3f4da44a0f..7cce5c1784 100644
--- a/tests/parm/nems.configure.cpld_esmfthreads.IN
+++ b/tests/parm/nems.configure.cpld_esmfthreads.IN
@@ -74,6 +74,7 @@ WAV_attributes::
   logfile = wav.log
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # CMEPS warm run sequence
diff --git a/tests/parm/nems.configure.cpld_noaero.IN b/tests/parm/nems.configure.cpld_noaero.IN
index d12b8e836d..e3a46f7957 100644
--- a/tests/parm/nems.configure.cpld_noaero.IN
+++ b/tests/parm/nems.configure.cpld_noaero.IN
@@ -67,6 +67,7 @@ WAV_attributes::
   logfile = wav.log
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # CMEPS warm run sequence
diff --git a/tests/parm/nems.configure.cpld_noaero_outwav.IN b/tests/parm/nems.configure.cpld_noaero_outwav.IN
index bd0b82a57f..5b2ab401b6 100644
--- a/tests/parm/nems.configure.cpld_noaero_outwav.IN
+++ b/tests/parm/nems.configure.cpld_noaero_outwav.IN
@@ -61,6 +61,7 @@ WAV_attributes::
   logfile = wav.log
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # CMEPS warm run sequence
diff --git a/tests/parm/nems.configure.hafs_atm_ocn_wav.IN b/tests/parm/nems.configure.hafs_atm_ocn_wav.IN
index 1953903040..8785145257 100644
--- a/tests/parm/nems.configure.hafs_atm_ocn_wav.IN
+++ b/tests/parm/nems.configure.hafs_atm_ocn_wav.IN
@@ -86,6 +86,7 @@ WAV_attributes::
   merge_import = .true.
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # Run Sequence #
diff --git a/tests/parm/nems.configure.hafs_atm_wav.IN b/tests/parm/nems.configure.hafs_atm_wav.IN
index dce5544c31..56cc2ac9dd 100644
--- a/tests/parm/nems.configure.hafs_atm_wav.IN
+++ b/tests/parm/nems.configure.hafs_atm_wav.IN
@@ -55,6 +55,7 @@ WAV_attributes::
   merge_import = .true.
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # Run Sequence #
diff --git a/tests/tests/hafs_regional_atm_ocn_wav b/tests/tests/hafs_regional_atm_ocn_wav
index 251dbbaba5..9c3f0dfbcc 100644
--- a/tests/tests/hafs_regional_atm_ocn_wav
+++ b/tests/tests/hafs_regional_atm_ocn_wav
@@ -14,7 +14,7 @@ export LIST_FILES="atmf006.nc \
                    archs.2019_241_06.a \
                    out_grd.ww3 \
                    out_pnt.ww3 \
-                   20190829.060000.restart.ww3 \
+                   ufs.hafs.ww3.r.2019-08-29-21600 \
                    ufs.hafs.cpl.r.2019-08-29-21600.nc"
 
 export_fv3
diff --git a/tests/tests/hafs_regional_atm_wav b/tests/tests/hafs_regional_atm_wav
index 73830aba29..cd1a8d57c5 100644
--- a/tests/tests/hafs_regional_atm_wav
+++ b/tests/tests/hafs_regional_atm_wav
@@ -12,7 +12,7 @@ export LIST_FILES="atmf006.nc \
                    sfcf006.nc \
                    out_grd.ww3 \
                    out_pnt.ww3 \
-                   20190829.060000.restart.ww3 \
+                   ufs.hafs.ww3.r.2019-08-29-21600 \
                    ufs.hafs.cpl.r.2019-08-29-21600.nc"
 
 export_fv3