diff --git a/.gitmodules b/.gitmodules
index b85216f992..77da5936e3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -146,7 +146,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 [submodule "cime"]
 path = cime
 url = https://github.com/ESMCI/cime
-fxtag = cime6.1.145
+fxtag = cime6.1.152
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESMCI/cime
 
diff --git a/cime b/cime
index 0fc24bad91..e752d032c7 160000
--- a/cime
+++ b/cime
@@ -1 +1 @@
-Subproject commit 0fc24bad917f692bce6438d56c573b4e9c7a6ef8
+Subproject commit e752d032c76ae2de21c9b72a5b1f4d0c5998c04d
diff --git a/cime_config/cam.case_setup.py b/cime_config/cam.case_setup.py
index e8cb17c5a6..b6c4473ac8 100755
--- a/cime_config/cam.case_setup.py
+++ b/cime_config/cam.case_setup.py
@@ -21,13 +21,14 @@
 
 logger = logging.getLogger(__name__)
 
-if len(sys.argv) != 3:
+if len(sys.argv) != 4:
     raise SystemExit(f"Incorrect call to {sys.argv[0]}, need CAM root and case root")
 # end if
 cam_root = sys.argv[1]
 case_root = sys.argv[2]
+non_local = sys.argv[3] == 'True'
 
-with Case(case_root) as case:
+with Case(case_root, non_local=non_local) as case:
     cam_config = case.get_value('CAM_CONFIG_OPTS')
     # Gather case information (from _build_usernl_files in case_setup.py)
     comp_interface = case.get_value("COMP_INTERFACE")
diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
index 47641cba0b..c53e94a5fd 100644
--- a/cime_config/testdefs/testlist_cam.xml
+++ b/cime_config/testdefs/testlist_cam.xml
@@ -84,7 +84,7 @@
     </machines>
     <options>
       <option name="comment">CAM7-LT, enable gpu for PUMAS, CLUBB, and RRTMGP</option>
-      <option name="wallclock">02:00:00</option>
+      <option name="wallclock">00:20:00</option>
     </options>
   </test>
 
@@ -1276,7 +1276,7 @@
       <machine name="derecho" compiler="nvhpc" category="prealpha"/>
     </machines>
     <options>
-      <option name="wallclock">02:00:00</option>
+      <option name="wallclock">00:20:00</option>
     </options>
   </test>
   <test compset="F2000dev" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq9s" supported="false">