diff --git a/CIME/data/config/config_tests.xml b/CIME/data/config/config_tests.xml
index 82fd600ac96..5e029ad8641 100644
--- a/CIME/data/config/config_tests.xml
+++ b/CIME/data/config/config_tests.xml
@@ -322,6 +322,7 @@ NODEFAIL          Tests restart upon detected node failure. Generates fake failu
     <HIST_OPTION>$STOP_OPTION</HIST_OPTION>
     <RESUBMIT>1</RESUBMIT>
     <CONTINUE_RUN>FALSE</CONTINUE_RUN>
+    <DOUT_S_SAVE_INTERIM_RESTART_FILES>TRUE</DOUT_S_SAVE_INTERIM_RESTART_FILES>
   </test>
 
   <test NAME="ERRI">
diff --git a/CIME/hist_utils.py b/CIME/hist_utils.py
index 253cae0b926..c5206cff05a 100644
--- a/CIME/hist_utils.py
+++ b/CIME/hist_utils.py
@@ -83,7 +83,6 @@ def copy_histfiles(case, suffix, match_suffix=None):
             )
 
             continue
-        comments += "  Copying hist files for model '{}'\n".format(model)
         test_hists = archive.get_latest_hist_files(
             casename, model, rundir, suffix=match_suffix, ref_case=ref_case
         )
@@ -93,6 +92,14 @@ def copy_histfiles(case, suffix, match_suffix=None):
             if not test_hist.endswith(".nc") or "once" in os.path.basename(test_hist):
                 logger.info("Will not compare non-netcdf file {}".format(test_hist))
                 continue
+            if model == "mom":
+                if "ocean_geometry" in test_hist:
+                    comments += "    skipping '{}'\n".format(test_hist)
+                    continue
+                if "mom6.ic" in test_hist:
+                    comments += "    skipping '{}'\n".format(test_hist)
+                    continue
+            comments += "  Copying hist files for model '{}'\n".format(model)
             new_file = "{}.{}".format(test_hist, suffix)
             if os.path.exists(new_file):
                 os.remove(new_file)