diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index fe4295e3f53..2e9073c7541 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -3,3 +3,4 @@ eabf877cbb86b281fdd37a3fa3cc0edf9b8eb874
 321463922724b225988e517da54a18bad90bc316
 927a9f23a11bc2c83e4fc1a0d004efd98f7cb812
 6751504adf095d5d034e6406fbb0e914924aecff
+ba1b6295047209fc76aebadd13c2b7b01bf17445
diff --git a/CIME/test_scheduler.py b/CIME/test_scheduler.py
index 2f05d946e03..1a7b810203c 100644
--- a/CIME/test_scheduler.py
+++ b/CIME/test_scheduler.py
@@ -63,6 +63,7 @@
     RUN_PHASE,
 ]  # Order matters
 
+
 ###############################################################################
 def _translate_test_names_for_new_pecount(test_names, force_procs, force_threads):
     ###############################################################################
@@ -130,6 +131,8 @@ def _translate_test_names_for_new_pecount(test_names, force_procs, force_threads
 
 
 _TIME_CACHE = {}
+
+
 ###############################################################################
 def _get_time_est(test, baseline_root, as_int=False, use_cache=False, raw=False):
     ###############################################################################
@@ -871,7 +874,6 @@ def _xml_phase(self, test):
         if case_opts is not None:
             logger.debug("case_opts are {} ".format(case_opts))
             for opt in case_opts:  # pylint: disable=not-an-iterable
-
                 logger.debug("case_opt is {}".format(opt))
                 if opt == "D":
                     envtest.set_test_parameter("DEBUG", "TRUE")
@@ -988,6 +990,14 @@ def _xml_phase(self, test):
                 case.set_value("GMAKE_J", self._proc_pool)
                 self._model_build_cost = self._proc_pool
 
+            # Izumi nag compiler needs DEBUG=TRUE
+            if compiler == "nag" and case.get_value("MACH") == "izumi":
+                debug_val = case.get_value("DEBUG")
+                expect(
+                    debug_val == True,
+                    "Izumi nag tests need DEBUG=TRUE, not {}".format(debug_val),
+                )
+
         return True, ""
 
     ###########################################################################