diff --git a/FV3 b/FV3
index ce81602fd1..295c53c189 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit ce81602fd1cb6be1cfb79689f9aaf9a6a00458c7
+Subproject commit 295c53c18969866d3a578ee58fa8ad7ab35f700e
diff --git a/tests/fv3_conf/gfs_v16_run_c192L127.IN b/tests/fv3_conf/gfs_v16_run_c192L127.IN
index d552738fe9..d708b52072 100644
--- a/tests/fv3_conf/gfs_v16_run_c192L127.IN
+++ b/tests/fv3_conf/gfs_v16_run_c192L127.IN
@@ -20,4 +20,5 @@ cp    @[INPUTDATA_ROOT]/FV3_input_data_c192L127/*configure .
 
 if [ $DO_RRTMGP = .T. ]; then
   cp @[INPUTDATA_ROOT]/FV3_input_data_c192L127/rrtmgp* .
+  cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
 fi
diff --git a/tests/parm/v16_c192L127_rrtmgp.nml.IN b/tests/parm/v16_c192L127_rrtmgp.nml.IN
index a2daf40edc..152bae9c85 100644
--- a/tests/parm/v16_c192L127_rrtmgp.nml.IN
+++ b/tests/parm/v16_c192L127_rrtmgp.nml.IN
@@ -133,7 +133,7 @@ deflate_level=1
   fhlwr        = 3600.
   ialb         = 1
   iems         = 1
-  iaer         = 5111
+  iaer         = @[IAER]
   icliq_sw     = 2
   iovr         = 3
   ico2         = 2
@@ -177,7 +177,7 @@ deflate_level=1
   debug        = .false.
   oz_phys      = .F.
   oz_phys_2015 = .T.
-  nstf_name    = 2,0,0,0,0
+  nstf_name    = @[NSTF_NAME]
   nst_anl      = .true.
   psautco      = 0.0008,0.0005
   prautco      = 0.00015,0.00015
@@ -202,8 +202,12 @@ deflate_level=1
   rrtmgp_nGptsLW     = 128
   rrtmgp_nBandsLW    = 16
   rrtmgp_nBandsSW    = 14
-  doG_cldoptics      = .true.
-  rrtmgp_nrghice = 3
+  doGP_cldoptics_LUT = .true.
+  doGP_lwscat        = .true.
+  use_LW_jacobian    = .true.
+  damp_LW_fluxadj    = .true.
+  lfnc_k             = 3125.
+  lfnc_p0            = 60000.
   lsoil_lsm    = 4
   do_mynnedmf  = .false.
   do_mynnsfclay = .false.
diff --git a/tests/tests/fv3_gfs_v16_RRTMGP_c192L127 b/tests/tests/fv3_gfs_v16_RRTMGP_c192L127
index b542ede33b..26f8f4058e 100644
--- a/tests/tests/fv3_gfs_v16_RRTMGP_c192L127
+++ b/tests/tests/fv3_gfs_v16_RRTMGP_c192L127
@@ -69,6 +69,8 @@ export LIST_FILES="phyf000.tile1.nc \
 export_fv3
 
 export DO_RRTMGP=.T.
+export NSTF_NAME=2,1,0,0,0
+export IAER=5111
 export TASKS=150
 export INPES=3
 export JNPES=8