diff --git a/NOAHMP-interface/noahmp b/NOAHMP-interface/noahmp
index 99e449d927..de0a1506ac 160000
--- a/NOAHMP-interface/noahmp
+++ b/NOAHMP-interface/noahmp
@@ -1 +1 @@
-Subproject commit 99e449d9279ea30225f2e63362baf56230640c1b
+Subproject commit de0a1506ac843679d2a78c1f0207266bd4d97a5e
diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
index cb7c435ec8..2eb2430dac 100644
--- a/tests/fv3_conf/control_run.IN
+++ b/tests/fv3_conf/control_run.IN
@@ -147,27 +147,3 @@ if [ $CPLCHM = .true. ]; then
   cp      ${PATHRT}/parm/gocart/*.rc .
   ln -sf  @[INPUTDATA_ROOT]/GOCART/p8/ExtData .
 fi
-
-#fix for land-sea mask inconsistency between fixed files and oro*, sfc* and gfs*
-#it will overwrite some files from coupled model input files
-#can be removed after fixing files for control_p8 
-if [[ $CCPP_SUITE = FV3_GFS_v17_p8 ]]; then
-  if [[ $ATMRES == C96 ]]; then
-    FV3_DIR=FV3_input_data
-  else
-    FV3_DIR=FV3_input_data${ATMRES#C}
-  fi
-  if [[ $ATMRES == C48 ]]; then
-     FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
-  else
-     FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}
-  fi
-  cp -r ${FV3_IC}/sfc_data*.nc ./INPUT
-  cp -r ${FV3_IC}/gfs_data*.nc ./INPUT
-  cp -r @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile1.nc INPUT/oro_data.tile1.nc
-  cp -r @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile2.nc INPUT/oro_data.tile2.nc
-  cp -r @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile3.nc INPUT/oro_data.tile3.nc
-  cp -r @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile4.nc INPUT/oro_data.tile4.nc
-  cp -r @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile5.nc INPUT/oro_data.tile5.nc
-  cp -r @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile6.nc INPUT/oro_data.tile6.nc  
-fi
diff --git a/tests/parm/nems.configure.atm_lnd.IN b/tests/parm/nems.configure.atm_lnd.IN
index 7bc95fad50..1ea3aa47ad 100644
--- a/tests/parm/nems.configure.atm_lnd.IN
+++ b/tests/parm/nems.configure.atm_lnd.IN
@@ -40,7 +40,7 @@ LND_petlist_bounds:             @[lnd_petlist_bounds]
 LND_attributes::
   Verbosity = 1
   Diagnostic = 0
-  mosaic_file = INPUT/C96_mosaic.nc
+  mosaic_file = INPUT/grid_spec.nc
   input_dir = INPUT/
   ic_type = @[lnd_ic_type] 
   layout = @[layout_x]:@[layout_y] # need to be consistent with number of PEs