diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index 47bbcc4af3..f488c21b27 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -1678,14 +1678,14 @@
       <pes pesize="any" compset="any">
         <comment>none</comment>
 	      <ntasks>
-	        <ntasks_atm>32</ntasks_atm>
-	        <ntasks_lnd>32</ntasks_lnd>
-	        <ntasks_rof>32</ntasks_rof>
-	        <ntasks_ice>32</ntasks_ice>
-	        <ntasks_ocn>32</ntasks_ocn>
-	        <ntasks_glc>32</ntasks_glc>
-	        <ntasks_wav>32</ntasks_wav>
-	        <ntasks_cpl>32</ntasks_cpl>
+	        <ntasks_atm>36</ntasks_atm>
+	        <ntasks_lnd>36</ntasks_lnd>
+	        <ntasks_rof>36</ntasks_rof>
+	        <ntasks_ice>36</ntasks_ice>
+	        <ntasks_ocn>36</ntasks_ocn>
+	        <ntasks_glc>36</ntasks_glc>
+	        <ntasks_wav>36</ntasks_wav>
+	        <ntasks_cpl>36</ntasks_cpl>
 	      </ntasks>
 	      <nthrds>
 	        <nthrds_atm>1</nthrds_atm>
diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
index 2801e231f7..d4fc9d40a8 100644
--- a/cime_config/testdefs/testlist_cam.xml
+++ b/cime_config/testdefs/testlist_cam.xml
@@ -583,6 +583,14 @@
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
       <machine name="izumi" compiler="gnu" category="carma"/>
+    </machines>
+    <options>
+      <option name="comment" >CARMA dust test</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="F2000climo" grid="f19_f19_mg17" name="ERS_D_Ln9" testmods="cam/carma_dust">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
     </machines>
     <options>
@@ -605,6 +613,14 @@
       <machine name="izumi" compiler="nag" category="carma"/>
       <machine name="izumi" compiler="gnu" category="carma"/>
       <machine name="izumi" compiler="nag" category="aux_cam"/>
+    </machines>
+    <options>
+      <option name="comment" >CARMA sea salt test</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_sea_salt">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
     </machines>
     <options>
@@ -616,7 +632,15 @@
   <test compset="QPWmaC6" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_meteor_smoke">
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
-      <machine name="derecho" compiler="intel" category="carma"/>
+    </machines>
+    <options>
+      <option name="comment" >CARMA test of aerosol from meteor smoke</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="QPWmaC6" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_meteor_smoke">
+    <machines>
+      <machine name="izumi" compiler="nag" category="carma"/>
     </machines>
     <options>
       <option name="comment" >CARMA test of aerosol from meteor smoke</option>
@@ -628,6 +652,14 @@
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
       <machine name="izumi" compiler="gnu" category="carma"/>
+    </machines>
+    <options>
+      <option name="comment" >CARMA test of aerosols from meteor impact</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="QPWmaC6" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_meteor_impact">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
     </machines>
     <options>
@@ -640,6 +672,14 @@
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
       <machine name="izumi" compiler="gnu" category="carma"/>
+    </machines>
+    <options>
+      <option name="comment" >CARMA Test of Polar Mesospheric Clouds (pmc)</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="QPWmaC6" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_pmc">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
     </machines>
     <options>
@@ -651,6 +691,14 @@
   <test compset="QPC5" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_radiative">
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
+    </machines>
+    <options>
+      <option name="comment" >CARMA radiation test</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="QPC5" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_radiative">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
     </machines>
     <options>
@@ -659,9 +707,17 @@
     </options>
   </test>
 <!--              carma test_tracers      -->
-  <test compset="QPC5" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_tracers">
+  <test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers">
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
+    </machines>
+    <options>
+      <option name="comment" >CARMA tracers test</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
     </machines>
     <options>
@@ -673,6 +729,14 @@
   <test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers2">
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
+    </machines>
+    <options>
+      <option name="comment" >CARMA tracers2 test</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers2">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
     </machines>
     <options>
@@ -684,6 +748,14 @@
   <test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_passive">
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
+    </machines>
+    <options>
+      <option name="comment" >CARMA passive test</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_passive">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
     </machines>
     <options>
@@ -696,6 +768,14 @@
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
       <machine name="izumi" compiler="gnu" category="carma"/>
+    </machines>
+    <options>
+      <option name="comment" >CARMA particle swelling test</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_swelling">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
     </machines>
     <options>
@@ -743,6 +823,14 @@
   <test compset="FW4ma2000" grid="f10_f10_mg37" name="SMS_D_Ln9" testmods="cam/carma_sulfate">
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
+   </machines>
+    <options>
+      <option name="comment" >CARMA pure sulfate test</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="FW4ma2000" grid="f45_f45_mg37" name="SMS_D_Ln9" testmods="cam/carma_sulfate">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
    </machines>
     <options>
@@ -754,6 +842,14 @@
   <test compset="FW4ma2000" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_mixed_sulfate">
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
+   </machines>
+    <options>
+      <option name="comment" >CARMA mixed sulfate test</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="FW4ma2000" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_mixed_sulfate">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
    </machines>
     <options>
@@ -762,9 +858,17 @@
     </options>
   </test>
 <!--              carma test_growth       -->
-  <test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_growth">
+  <test compset="QPC5" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_growth">
     <machines>
       <machine name="izumi" compiler="nag" category="carma"/>
+    </machines>
+    <options>
+      <option name="comment" >CARMA particle growth test</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+  <test compset="QPC5" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_growth">
+    <machines>
       <machine name="derecho" compiler="intel" category="carma"/>
     </machines>
     <options>