diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompInitDbh/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompInitDbh/shell_commands
index 438b95731f..cb6de531b5 100644
--- a/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompInitDbh/shell_commands
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompInitDbh/shell_commands
@@ -1,4 +1,4 @@
-SRCDIR=`./xmlquery SRCROOT --value`
+SRCDIR=`./xmlquery COMP_ROOT_DIR_LND --value`
 CASEDIR=`./xmlquery CASEROOT --value`
 FATESDIR=$SRCDIR/src/fates/
 FATESPARAMFILE=$CASEDIR/fates_params_init_dbh.json
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods
index e781a89ea2..e73d79a391 100644
--- a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods
@@ -1,3 +1,2 @@
 ../Fates
 ../FatesCold
-../FatesSetupParamBuild/
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/shell_commands
index 139be432dd..da24cb79a5 100644
--- a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/shell_commands
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/shell_commands
@@ -1,4 +1,4 @@
-SRCDIR=`./xmlquery SRCROOT --value`
+SRCDIR=`./xmlquery COMP_ROOT_DIR_LND --value`
 CASEDIR=`./xmlquery CASEROOT --value`
 FATESDIR=$SRCDIR/src/fates/
 FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_p.json
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/include_user_mods
index e781a89ea2..e73d79a391 100644
--- a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/include_user_mods
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/include_user_mods
@@ -1,3 +1,2 @@
 ../Fates
 ../FatesCold
-../FatesSetupParamBuild/
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/shell_commands
index 2ebf250b2d..5af10d86d0 100644
--- a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/shell_commands
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/shell_commands
@@ -1,4 +1,4 @@
-SRCDIR=`./xmlquery SRCROOT --value`
+SRCDIR=`./xmlquery COMP_ROOT_DIR_LND --value`
 CASEDIR=`./xmlquery CASEROOT --value`
 FATESDIR=$SRCDIR/src/fates/
 FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_np.json
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/README b/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/README
index 484fa67db9..ee8c58d6d3 100644
--- a/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/README
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/README
@@ -11,8 +11,8 @@ Given that the default fates parameter file has the above variables as unset,
 a custom fates parameter file must be supplied to appropriately test this mode.
 This testmod itself addresses CTSM issue 2151: https://github.com/ESCOMP/CTSM/issues/2151
 Note that to avoid exceeding the filename string length maximu, the parameter
-file generated on the fly is placed in the $SRCROOT/src/fates/parameter_files
-directory.  This may still run into problems is the $SRCROOT string is too long.
+file generated on the fly is placed in the $COMP_ROOT_DIR_LND/src/fates/parameter_files
+directory.  This may still run into problems is the $COMP_ROOT_DIR_LND string is too long.
 
 The max_dist value will impact the size of the 'neighborhood' of gridcells
 that fates will attempt to distribute seeds to.  To limit the neighborhood to
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/include_user_mods
index 5ad8824b70..e73d79a391 100644
--- a/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/include_user_mods
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/include_user_mods
@@ -1,3 +1,2 @@
 ../Fates
 ../FatesCold
-../FatesSetupParamBuild
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/shell_commands
index 585a6d65cb..40f10e24c2 100644
--- a/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/shell_commands
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/shell_commands
@@ -1,4 +1,4 @@
-SRCDIR=`./xmlquery SRCROOT --value`
+SRCDIR=`./xmlquery COMP_ROOT_DIR_LND --value`
 CASEDIR=`./xmlquery CASEROOT --value`
 FATESDIR=$SRCDIR/src/fates/
 
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdTwoStream/README b/cime_config/testdefs/testmods_dirs/clm/FatesColdTwoStream/README
index 295f8125f3..5c7384bae2 100644
--- a/cime_config/testdefs/testmods_dirs/clm/FatesColdTwoStream/README
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdTwoStream/README
@@ -5,8 +5,8 @@ parameter from 1 to 2.  This is all that is needed, both radiation schemes
 fates_rad_model
 
 Note that to avoid exceeding the filename string length maximum, the parameter
-file generated on the fly is placed in the $SRCROOT/src/fates/parameter_files
-directory.  This may still run into problems is the $SRCROOT string is too long.
+file generated on the fly is placed in the $COMP_ROOT_DIR_LND/src/fates/parameter_files
+directory.  This may still run into problems is the $COMP_ROOT_DIR_LND string is too long.
 
 Like the test with seed dispersal activation, the main downside of this method is
 that this file will require a custom update for every fates parameter file API update.
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesSetupParamBuild/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesSetupParamBuild/shell_commands
index f8a0069c6f..1a4ad27be8 100755
--- a/cime_config/testdefs/testmods_dirs/clm/FatesSetupParamBuild/shell_commands
+++ b/cime_config/testdefs/testmods_dirs/clm/FatesSetupParamBuild/shell_commands
@@ -68,8 +68,8 @@ check_if_runable () {
 main() {
    # If under a casedirectory get a few variables for later use
    if [ -f xmlquery ]; then
-      SRCDIR=$(./xmlquery SRCROOT --value || echo "null")
-      check_error $? "Trouble getting SRCROOT from case"
+      SRCDIR=$(./xmlquery COMP_ROOT_DIR_LND --value || echo "null")
+      check_error $? "Trouble getting COMP_ROOT_DIR_LND from case"
       DEBUG=0
    # otherwise if this is being run in the testmod directory for debugging
    else