diff --git a/parm/atm/jcb-base.yaml.j2 b/parm/atm/jcb-base.yaml.j2
index 39c626a84..d7e1e5907 100644
--- a/parm/atm/jcb-base.yaml.j2
+++ b/parm/atm/jcb-base.yaml.j2
@@ -27,11 +27,6 @@ final_prints_frequency: PT3H
 number_of_outer_loops: 2
 analysis_variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
 
-# Testing
-# -------
-
-do_testing: {{ DO_TEST_MODE | default(false, true) }}
-
 # Model things
 # ------------
 # Geometry
diff --git a/parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2 b/parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2
index f7f6db57a..c0aaa3d38 100644
--- a/parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2
+++ b/parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2
@@ -4,7 +4,10 @@ algorithm: fv3jedi_fv3inc_variational
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'gdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_3dvar-fv3inc.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/atm/jcb-prototype_3dvar.yaml.j2 b/parm/atm/jcb-prototype_3dvar.yaml.j2
index b89b65105..e1e2ff836 100644
--- a/parm/atm/jcb-prototype_3dvar.yaml.j2
+++ b/parm/atm/jcb-prototype_3dvar.yaml.j2
@@ -33,7 +33,10 @@ observations:
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'gdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_3dvar.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_3dvar.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2 b/parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2
index 9845103df..f7bf0049b 100644
--- a/parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2
+++ b/parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2
@@ -4,7 +4,10 @@ algorithm: fv3jedi_fv3inc_lgetkf
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf-fv3inc.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf-fv3inc.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/atm/jcb-prototype_lgetkf.yaml.j2 b/parm/atm/jcb-prototype_lgetkf.yaml.j2
index 04f9faafd..03e364825 100644
--- a/parm/atm/jcb-prototype_lgetkf.yaml.j2
+++ b/parm/atm/jcb-prototype_lgetkf.yaml.j2
@@ -41,7 +41,10 @@ observations:
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2 b/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
index 39e682415..62bc4b813 100644
--- a/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
+++ b/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
@@ -47,7 +47,10 @@ distribution_type: RoundRobin
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf_observer.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf_observer.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2 b/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
index 7abccdd6e..ca62821aa 100644
--- a/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
+++ b/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
@@ -50,7 +50,10 @@ distribution_type: Halo
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf_solver.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf_solver.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/soca/marine-jcb-3dfgat.yaml.j2 b/parm/soca/marine-jcb-3dfgat.yaml.j2
index 59d0b9ff5..f5301fb32 100644
--- a/parm/soca/marine-jcb-3dfgat.yaml.j2
+++ b/parm/soca/marine-jcb-3dfgat.yaml.j2
@@ -6,7 +6,10 @@ observations: !INC ${OBS_LIST_SHORT}
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'gdas'  %}
+do_testing: true
 test_reference_filename: '{{HOMEgfs}}/sorc/gdas.cd/test/testreference/C48mx500_3DVarAOWCDA_3dfgat.ref'
 test_output_filename: '{{HOMEgfs}}/sorc/gdas.cd/build/gdas/test/testoutput/C48mx500_3DVarAOWCDA_3dfgat.test.out'
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/soca/marine-jcb-base.yaml b/parm/soca/marine-jcb-base.yaml
index 1b55dc7d2..7ca450c7c 100644
--- a/parm/soca/marine-jcb-base.yaml
+++ b/parm/soca/marine-jcb-base.yaml
@@ -26,11 +26,6 @@ final_prints_frequency: PT3H
 number_of_outer_loops: 1
 analysis_variables: [sea_ice_area_fraction, sea_ice_thickness, sea_ice_snow_thickness, sea_water_salinity, sea_water_potential_temperature, eastward_sea_water_velocity, northward_sea_water_velocity, sea_surface_height_above_geoid]
 
-# Testing
-# -------
-
-do_testing: '{{ DO_TEST_MODE | default(false, true) }}'
-
 # Model things
 # ------------
 marine_window_begin: '{{MARINE_WINDOW_BEGIN}}'
diff --git a/test/atm/global-workflow/jcb-prototype_3dvar-fv3inc.yaml.j2 b/test/atm/global-workflow/jcb-prototype_3dvar-fv3inc.yaml.j2
index 9686fbbce..f30be7ad9 100644
--- a/test/atm/global-workflow/jcb-prototype_3dvar-fv3inc.yaml.j2
+++ b/test/atm/global-workflow/jcb-prototype_3dvar-fv3inc.yaml.j2
@@ -4,7 +4,10 @@ algorithm: fv3jedi_fv3inc_variational
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'gdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_3dvar-fv3inc.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_3dvar-fv3inc.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2 b/test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2
index 7465a4274..104d8004d 100644
--- a/test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2
+++ b/test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2
@@ -17,7 +17,10 @@ atmosphere_obsdatain_suffix: ".{{ current_cycle | to_YMDH }}.nc"
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'gdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_3dvar.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_3dvar.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/test/atm/global-workflow/jcb-prototype_lgetkf-fv3inc.yaml.j2 b/test/atm/global-workflow/jcb-prototype_lgetkf-fv3inc.yaml.j2
index cd11e771d..1238593e1 100644
--- a/test/atm/global-workflow/jcb-prototype_lgetkf-fv3inc.yaml.j2
+++ b/test/atm/global-workflow/jcb-prototype_lgetkf-fv3inc.yaml.j2
@@ -4,7 +4,10 @@ algorithm: fv3jedi_fv3inc_lgetkf
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf-fv3inc.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf-fv3inc.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/test/atm/global-workflow/jcb-prototype_lgetkf.yaml.j2 b/test/atm/global-workflow/jcb-prototype_lgetkf.yaml.j2
index e6b1f9593..0b01cdd8c 100644
--- a/test/atm/global-workflow/jcb-prototype_lgetkf.yaml.j2
+++ b/test/atm/global-workflow/jcb-prototype_lgetkf.yaml.j2
@@ -22,7 +22,10 @@ atmosphere_obsdatain_suffix: ".{{ current_cycle | to_YMDH }}.nc"
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/test/atm/global-workflow/jcb-prototype_lgetkf_observer.yaml.j2 b/test/atm/global-workflow/jcb-prototype_lgetkf_observer.yaml.j2
index ac0fcd7dd..f6d76e22d 100644
--- a/test/atm/global-workflow/jcb-prototype_lgetkf_observer.yaml.j2
+++ b/test/atm/global-workflow/jcb-prototype_lgetkf_observer.yaml.j2
@@ -28,7 +28,10 @@ distribution_type: RoundRobin
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf_observer.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf_observer.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/test/atm/global-workflow/jcb-prototype_lgetkf_solver.yaml.j2 b/test/atm/global-workflow/jcb-prototype_lgetkf_solver.yaml.j2
index 2c3bd2aae..78215fefe 100644
--- a/test/atm/global-workflow/jcb-prototype_lgetkf_solver.yaml.j2
+++ b/test/atm/global-workflow/jcb-prototype_lgetkf_solver.yaml.j2
@@ -28,7 +28,10 @@ distribution_type: Halo
 
 # Testing things
 # --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf_solver.ref
 test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf_solver.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
+{% endif %}