diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
index 8062359f37..041cb51516 100644
--- a/cime_config/testdefs/ExpectedTestFails.xml
+++ b/cime_config/testdefs/ExpectedTestFails.xml
@@ -36,6 +36,31 @@
     </phase>
   </test>
 
+  <test name="SMS_Ld5.f09_g17.IHistClm50Sp.derecho_intel.clm-nofire">
+    <phase name="RUN">
+      <status>FAIL</status>
+      <issue>#2784</issue>
+    </phase>
+  </test>
+  <test name="SMS_Ld5.f19_g17.IHistClm50Sp.derecho_intel.clm-nofire">
+    <phase name="RUN">
+      <status>FAIL</status>
+      <issue>#2784</issue>
+    </phase>
+  </test>
+  <test name="SMS_Ld5.f09_g17.IHistClm60Sp.derecho_intel.clm-nofire">
+    <phase name="RUN">
+      <status>FAIL</status>
+      <issue>#2784</issue>
+    </phase>
+  </test>
+  <test name="SMS_Ld5.f19_g17.IHistClm60Sp.derecho_intel.clm-nofire">
+    <phase name="RUN">
+      <status>FAIL</status>
+      <issue>#2784</issue>
+    </phase>
+  </test>
+
   <!-- aux_clm test suite failures -->
   <test name="SMS_Ld2_D_PS.f09_g17.I1850Clm50BgcCropCmip6.derecho_intel.clm-basic_interp">
     <phase name="RUN">
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 2e1ae173a1..2bd253ed49 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -2159,45 +2159,41 @@
     </options>
   </test>
   <!-- Historical science support for clm5_0 workhorse resolutions -->
-  <test name="SMS_Ld5" grid="f09_g17" compset="IHistClm50Sp" testmods="clm/nofireemis">
+  <test name="SMS_Ld5" grid="f09_g17" compset="IHistClm50Sp" testmods="clm/nofire">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
       <option name="comment"  >Science support for historical clm5_0 physics with SP mode at f09</option>
-      <option name="comment"  >Also --nofireemis because this is a SP compset</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/nofireemis">
+  <test name="SMS_Ld5" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/nofire">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
       <option name="comment"  >Science support for historical clm5_0 physics with SP mode at f19</option>
-      <option name="comment"  >Also --nofireemis because this is a SP compset</option>
     </options>
   </test>
   <!-- Historical science support for clm6_0 workhorse resolutions -->
-  <test name="SMS_Ld5" grid="f09_g17" compset="IHistClm60Sp" testmods="clm/nofireemis">
+  <test name="SMS_Ld5" grid="f09_g17" compset="IHistClm60Sp" testmods="clm/nofire">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
       <option name="comment"  >Science support for historical clm6_0 physics with SP mode at f09</option>
-      <option name="comment"  >Also --nofireemis because this is a SP compset</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f19_g17" compset="IHistClm60Sp" testmods="clm/nofireemis">
+  <test name="SMS_Ld5" grid="f19_g17" compset="IHistClm60Sp" testmods="clm/nofire">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
       <option name="comment"  >Science support for historical clm6_0 physics with SP mode at f19</option>
-      <option name="comment"  >Also --nofireemis because this is a SP compset</option>
     </options>
   </test>
   <test name="SMS_Ln9" grid="ne30pg2_ne30pg2_mg17" compset="I1850Clm50Sp" testmods="clm/clm50cam6LndTuningMode--clm/nofireemis">