diff --git a/CIME/SystemTests/eri.py b/CIME/SystemTests/eri.py
index 6d80a8fd808..fdd02455987 100644
--- a/CIME/SystemTests/eri.py
+++ b/CIME/SystemTests/eri.py
@@ -90,7 +90,11 @@ def run_phase(self):
         start_1_year, start_1_month, start_1_day = [
             int(item) for item in start_1.split("-")
         ]
-        start_2_year = start_1_year + 2
+        # Change the year for the hybrid case to make sure the system can handle this change in year.
+        # Note: When using a Gregorian calendar, it is important for the two years to be leap years
+        #       because a testmod which tests the gregorian calendar starts the runs on leap day,
+        #       which must exist in all of the start years.
+        start_2_year = start_1_year + 4
         start_2 = "{:04d}-{:02d}-{:02d}".format(
             start_2_year, start_1_month, start_1_day
         )
diff --git a/CIME/test_scheduler.py b/CIME/test_scheduler.py
index 2f05d946e03..a58fcc30f8b 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):
     ###############################################################################
@@ -881,7 +884,7 @@ def _xml_phase(self, test):
                     envtest.set_test_parameter("USE_ESMF_LIB", "TRUE")
                     logger.debug(" USE_ESMF_LIB set to TRUE")
 
-                elif opt == "CG":
+                elif opt == "cG":
                     envtest.set_test_parameter("CALENDAR", "GREGORIAN")
                     logger.debug(" CALENDAR set to {}".format(opt))
 
diff --git a/doc/source/system_testing.rst b/doc/source/system_testing.rst
index 9b539fb9605..8b315405cb2 100644
--- a/doc/source/system_testing.rst
+++ b/doc/source/system_testing.rst
@@ -314,7 +314,7 @@ MODIFIERS    Description
 ============ =====================================================================================
    _C#       Set number of instances to # and use the multi driver (can't use with _N).
 
-   _CG       CALENDAR set to "GREGORIAN".
+   _cG       CALENDAR set to "GREGORIAN".
 
    _D        XML variable DEBUG set to "TRUE".