diff --git a/cime_config/testdefs/testlist_drv.xml b/cime_config/testdefs/testlist_drv.xml
index e17b2ffcf..948bd267b 100644
--- a/cime_config/testdefs/testlist_drv.xml
+++ b/cime_config/testdefs/testlist_drv.xml
@@ -65,6 +65,16 @@
     </options>
   </test>
 
+  <test compset="X" grid="f19_g17" name="ERS_D_Ln9" testmods="drv/aoflux_ogrid">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_cmeps"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 00:40:00 </option>
+      <option name="comment">The default aoflux_grid is now xgrid; include a debug test with different atm/ocn grids with aoflux_grid=ogrid to make sure that option continues to work.</option>
+    </options>
+  </test>
+
   <!-- ======================================= -->
   <!-- B compsets -->
   <!-- ======================================= -->
diff --git a/cime_config/testdefs/testmods_dirs/drv/aoflux_ogrid/user_nl_cpl b/cime_config/testdefs/testmods_dirs/drv/aoflux_ogrid/user_nl_cpl
new file mode 100644
index 000000000..91228d3fe
--- /dev/null
+++ b/cime_config/testdefs/testmods_dirs/drv/aoflux_ogrid/user_nl_cpl
@@ -0,0 +1 @@
+aoflux_grid = "ogrid"