diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg
index e60420f7..8cc1a070 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg
@@ -14,7 +14,7 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_scratch/unique_id/v3.LR.historical_0051"
 walltime = "00:30:00"
 
 [e3sm_diags]
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg
index b793ca7a..f9611ca1 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg
@@ -14,5 +14,5 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/unique_id/v3.LR.historical_0051"
 walltime = "00:30:00"
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg
index f833ffa1..77a8dcd0 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg
@@ -14,7 +14,7 @@ years = "1995:1997:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_scratch/unique_id/v3.LR.historical_0051"
 walltime = "00:30:00"
 
 [e3sm_diags]
diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg
new file mode 100644
index 00000000..212baec1
--- /dev/null
+++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg
@@ -0,0 +1,18 @@
+[default]
+case = "v3.LR.historical_0051"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/unique_id/v3.LR.historical_0051"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/unique_id"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_scratch/unique_id/v3.LR.historical_0051"
+walltime = "00:30:00"
diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg
new file mode 100644
index 00000000..3a116479
--- /dev/null
+++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg
@@ -0,0 +1,20 @@
+# Run this immediately after running _1
+
+[default]
+case = "v3.LR.historical_0051"
+constraint = ""
+dry_run = "False"
+environment_commands = ""
+input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/unique_id/v3.LR.historical_0051"
+partition = "debug"
+qos = "regular"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/unique_id"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_scratch/unique_id/v3.LR.historical_0051"
+walltime = "00:30:00"
diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg
index 89c3666a..bee3979a 100644
--- a/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg
+++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg
@@ -14,7 +14,7 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#"
+scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_scratch/#expand unique_id#/#expand case_name#"
 walltime = "00:30:00"
 
 [e3sm_diags]
diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg
index 75049be4..51e0426e 100644
--- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg
+++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg
@@ -14,5 +14,5 @@ years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#"
+scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/#expand unique_id#/#expand case_name#"
 walltime = "00:30:00"
diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg
index 610ae65b..98085c90 100644
--- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg
+++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg
@@ -14,7 +14,7 @@ years = "1995:1997:2",
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#"
+scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_mvm_2_scratch/#expand unique_id#/#expand case_name#"
 walltime = "00:30:00"
 
 [e3sm_diags]
diff --git a/tests/integration/template_min_case_tc_analysis_simultaneous_1.cfg b/tests/integration/template_min_case_tc_analysis_simultaneous_1.cfg
new file mode 100644
index 00000000..7309eca5
--- /dev/null
+++ b/tests/integration/template_min_case_tc_analysis_simultaneous_1.cfg
@@ -0,0 +1,18 @@
+[default]
+case = "#expand case_name#"
+constraint = "#expand constraint#"
+dry_run = "#expand dry_run#"
+environment_commands = "#expand environment_commands#"
+input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name#
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "#expand user_output#zppy_min_case_tc_analysis_simultaneous_1_output/#expand unique_id#/#expand case_name#"
+partition = "#expand partition_short#"
+qos = "#expand qos_short#"
+www = "#expand user_www#zppy_min_case_tc_analysis_simultaneous_1_www/#expand unique_id#"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+scratch = "#expand scratch#zppy_min_case_tc_analysis_simultaneous_1_scratch/#expand unique_id#/#expand case_name#"
+walltime = "00:30:00"
diff --git a/tests/integration/template_min_case_tc_analysis_simultaneous_2.cfg b/tests/integration/template_min_case_tc_analysis_simultaneous_2.cfg
new file mode 100644
index 00000000..d9318b58
--- /dev/null
+++ b/tests/integration/template_min_case_tc_analysis_simultaneous_2.cfg
@@ -0,0 +1,20 @@
+# Run this immediately after running _1
+
+[default]
+case = "#expand case_name#"
+constraint = "#expand constraint#"
+dry_run = "#expand dry_run#"
+environment_commands = "#expand environment_commands#"
+input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name#
+input_subdir = archive/atm/hist
+mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
+output = "#expand user_output#zppy_min_case_tc_analysis_simultaneous_2_output/#expand unique_id#/#expand case_name#"
+partition = "#expand partition_short#"
+qos = "#expand qos_short#"
+www = "#expand user_www#zppy_min_case_tc_analysis_simultaneous_2_www/#expand unique_id#"
+years = "1985:1987:2",
+
+[tc_analysis]
+active = True
+scratch = "#expand scratch#zppy_min_case_tc_analysis_simultaneous_2_scratch/#expand unique_id#/#expand case_name#"
+walltime = "00:30:00"
diff --git a/tests/integration/utils.py b/tests/integration/utils.py
index 9a65b059..34c29dc6 100644
--- a/tests/integration/utils.py
+++ b/tests/integration/utils.py
@@ -268,6 +268,8 @@ def generate_cfgs(unified_testing=False, dry_run=False):
         "complete_run",
         "debug",
         "min_case_add_dependencies",
+        "min_case_tc_analysis_simultaneous_1",
+        "min_case_tc_analysis_simultaneous_2",
         "min_case_e3sm_diags_depend_on_climo_mvm_1",
         "min_case_e3sm_diags_depend_on_climo_mvm_2",
         "min_case_e3sm_diags_depend_on_climo",