diff --git a/tests/parm/ufs.configure.s2sa.IN b/tests/parm/ufs.configure.s2sa.IN
index 886632476e..e5f9439e17 100644
--- a/tests/parm/ufs.configure.s2sa.IN
+++ b/tests/parm/ufs.configure.s2sa.IN
@@ -45,7 +45,9 @@ OCN_attributes::
   DumpFields = false
   ProfileMemory = false
   OverwriteSlice = true
-  mesh_ocn = @[MESHOCN_ICE]
+  mesh_ocn = @[MESH_OCN]
+  use_coldstart = @[use_coldstart]
+  use_mommesh = @[use_mommesh]
 ::
 
 # ICE #
@@ -57,7 +59,8 @@ ICE_attributes::
   DumpFields = false
   ProfileMemory = false
   OverwriteSlice = true
-  mesh_ice = @[MESHOCN_ICE]
+  mesh_ice = @[MESH_ICE]
+  eps_imesh = @[eps_imesh]
   stop_n = @[RESTART_N]
   stop_option = nhours
   stop_ymd = -999
@@ -114,15 +117,12 @@ ALLCOMP_attributes::
       ScalarFieldIdxGridNY = 2
       ScalarFieldName = cpl_scalars
       start_type = @[RUNTYPE]
-      restart_dir = RESTART/
+      restart_dir = @[CMEPS_RESTART_DIR]
       case_name = ufs.cpld
       restart_n = @[RESTART_N]
       restart_option = nhours
       restart_ymd = -999
       dbug_flag = @[cap_dbug_flag]
-      use_coldstart = @[use_coldstart]
-      use_mommesh = @[use_mommesh]
-      eps_imesh = @[eps_imesh]
       stop_n = @[FHMAX]
       stop_option = nhours
       stop_ymd = -999