diff --git a/cime_config/testdefs/testlist_pop.xml b/cime_config/testdefs/testlist_pop.xml
index 2693a6e1..d2a8c362 100644
--- a/cime_config/testdefs/testlist_pop.xml
+++ b/cime_config/testdefs/testlist_pop.xml
@@ -453,6 +453,12 @@
       <machine name="cheyenne" compiler="intel" category="aux_cime_baselines"/>
     </machines>
   </test>
+  <test name="SMS" grid="T62_g37" compset="C1850ECO_ECOCESM21" testmods="pop/ecosys_add_cocco">
+    <machines>
+      <machine name="cheyenne" compiler="intel" category="aux_pop_MARBL"/>
+      <machine name="hobart" compiler="nag" category="aux_pop_MARBL"/>
+    </machines>
+  </test>
   <test name="SMS" grid="T62_g17" compset="C1850ECO" testmods="pop/ecosys_add_cocco">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_pop_MARBL"/>
diff --git a/cime_config/testdefs/testmods_dirs/pop/ecosys_add_cocco/shell_commands b/cime_config/testdefs/testmods_dirs/pop/ecosys_add_cocco/shell_commands
index 18dfce69..b2861a6c 100644
--- a/cime_config/testdefs/testmods_dirs/pop/ecosys_add_cocco/shell_commands
+++ b/cime_config/testdefs/testmods_dirs/pop/ecosys_add_cocco/shell_commands
@@ -1 +1,8 @@
-./xmlchange OCN_BGC_CONFIG=cesm2.1+cocco
+# Check current value of OCN_BGC_CONFIG
+ocn_bgc_config=(`./xmlquery OCN_BGC_CONFIG --value`)
+
+if [[ "${ocn_bgc_config}" == "latest" ]]; then
+  ./xmlchange OCN_BGC_CONFIG=with_cocco
+elif [[ "${ocn_bgc_config}" == "cesm2.1" ]]; then
+  ./xmlchange OCN_BGC_CONFIG=cesm2.1+cocco
+fi