diff --git a/parm/aero/variational/3dvar_gfs_aero.yaml b/parm/aero/variational/3dvar_gfs_aero.yaml
index af1e62de2..218f4c88d 100644
--- a/parm/aero/variational/3dvar_gfs_aero.yaml
+++ b/parm/aero/variational/3dvar_gfs_aero.yaml
@@ -15,18 +15,18 @@ cost function:
                        mass_fraction_of_sea_salt004_in_air]
   geometry:
     fms initialization:
-      namelist filename: $(DATA)/fv3jedi/fmsmpp.nml
-      field table filename: $(DATA)/fv3jedi/field_table
-    akbk: $(DATA)/fv3jedi/akbk.nc4
+      namelist filename: ./fv3jedi/fmsmpp.nml
+      field table filename: ./fv3jedi/field_table
+    akbk: ./fv3jedi/akbk.nc4
     layout:
     - $(layout_x)
     - $(layout_y)
     npx: $(npx_ges)
     npy: $(npy_ges)
     npz: $(npz_ges)
-    field metadata override: $(DATA)/fv3jedi/fv3jedi_fieldmetadata_restart.yaml
+    field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
   background:
-    datapath: $(DATA)/bkg
+    datapath: ./bkg
     filetype: fms restart
     datetime: '{{ current_cycle | to_isotime }}'
     filename_core: '{{ current_cycle | to_fv3time }}.fv_core.res.nc'
@@ -46,16 +46,16 @@ variational:
     test: on
     geometry:
       fms initialization:
-        namelist filename: $(DATA)/fv3jedi/fmsmpp.nml
-        field table filename: $(DATA)/fv3jedi/field_table
-      akbk: $(DATA)/fv3jedi/akbk.nc4
+        namelist filename: ./fv3jedi/fmsmpp.nml
+        field table filename: ./fv3jedi/field_table
+      akbk: ./fv3jedi/akbk.nc4
       layout:
       - $(layout_x)
       - $(layout_y)
       npx: $(npx_anl)
       npy: $(npy_anl)
       npz: $(npz_anl)
-      field metadata override: $(DATA)/fv3jedi/fv3jedi_fieldmetadata_restart.yaml
+      field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
     diagnostics:
       departures: bkgmob
   - ninner: 35
@@ -63,16 +63,16 @@ variational:
     test: on
     geometry:
       fms initialization:
-        namelist filename: $(DATA)/fv3jedi/fmsmpp.nml
-        field table filename: $(DATA)/fv3jedi/field_table
-      akbk: $(DATA)/fv3jedi/akbk.nc4
+        namelist filename: ./fv3jedi/fmsmpp.nml
+        field table filename: ./fv3jedi/field_table
+      akbk: ./fv3jedi/akbk.nc4
       layout:
       - $(layout_x)
       - $(layout_y)
       npx: $(npx_anl)
       npy: $(npy_anl)
       npz: $(npz_anl)
-      field metadata override: $(DATA)/fv3jedi/fv3jedi_fieldmetadata_restart.yaml
+      field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
     diagnostics:
       departures: bkgmob1
 final:
@@ -81,18 +81,18 @@ final:
   increment:
     geometry:
       fms initialization:
-        namelist filename: $(DATA)/fv3jedi/fmsmpp.nml
-        field table filename: $(DATA)/fv3jedi/field_table
-      akbk: $(DATA)/fv3jedi/akbk.nc4
+        namelist filename: ./fv3jedi/fmsmpp.nml
+        field table filename: ./fv3jedi/field_table
+      akbk: ./fv3jedi/akbk.nc4
       layout:
       - $(layout_x)
       - $(layout_y)
       npx: $(npx_ges)
       npy: $(npy_ges)
       npz: $(npz_ges)
-      field metadata override: $(DATA)/fv3jedi/fv3jedi_fieldmetadata_restart.yaml
+      field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
     output:
-      datapath: $(DATA)/anl
+      datapath: ./anl
       prefix: aeroinc
       filetype: fms restart
       filename_core: '{{ current_cycle | to_fv3time }}.fv_core.res.nc'
diff --git a/test/aero/global-workflow/gdas_prototype.yaml b/test/aero/global-workflow/gdas_prototype.yaml
index 12641793e..5a8e21bd6 100644
--- a/test/aero/global-workflow/gdas_prototype.yaml
+++ b/test/aero/global-workflow/gdas_prototype.yaml
@@ -1,2 +1,2 @@
 observers:
-- !INC ${OBS_YAML_DIR}/viirs_npp.yaml
+- !INC ${OBS_YAML_DIR}/viirs_npp_aod.yaml
diff --git a/test/aero/global-workflow/jjob_var_init.sh b/test/aero/global-workflow/jjob_var_init.sh
index dfd952e04..36276ce35 100755
--- a/test/aero/global-workflow/jjob_var_init.sh
+++ b/test/aero/global-workflow/jjob_var_init.sh
@@ -69,7 +69,7 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} generate_com -rx \
 # Link observations
 dpath=gdas.$PDY/$cyc/obs
 mkdir -p $COM_OBS
-flist="viirs_aod_npp.$CDATE.nc4"
+flist="viirs_npp.$CDATE.nc4"
 for file in $flist; do
    ln -fs $GDASAPP_TESTDATA/lowres/$dpath/${oprefix}.$file $COM_OBS/
 done