diff --git a/src/tests/Common/CLRTest.CrossGen.targets b/src/tests/Common/CLRTest.CrossGen.targets
index 7b9535650df01..87534106fac23 100644
--- a/src/tests/Common/CLRTest.CrossGen.targets
+++ b/src/tests/Common/CLRTest.CrossGen.targets
@@ -164,7 +164,7 @@ fi
         ]]>
       </CrossgenBashScript>
 
-      <BashCLRTestPreCommands>$(BashCLRTestPreCommands);$(CrossgenBashScript)</BashCLRTestPreCommands>
+      <CLRTestBashPreCommands>$(CLRTestBashPreCommands);$(CrossgenBashScript)</CLRTestBashPreCommands>
     </PropertyGroup>
   </Target>
 
diff --git a/src/tests/Common/CLRTest.Execute.Bash.targets b/src/tests/Common/CLRTest.Execute.Bash.targets
index bbeea29f894b6..6104dbd9ecdad 100644
--- a/src/tests/Common/CLRTest.Execute.Bash.targets
+++ b/src/tests/Common/CLRTest.Execute.Bash.targets
@@ -276,8 +276,8 @@ fi
       <PropertyGroup>
       <CLRTestRunFile Condition="'$(CLRTestIsHosted)'=='true'">"$CORE_ROOT/corerun" $(CoreRunArgs)  ${__DotEnvArg}</CLRTestRunFile>
 
-      <BashCLRTestPreCommands Condition="'$(CLRTestKind)' == 'BuildAndRun' and '$(TargetArchitecture)' == 'wasm'">
-   <![CDATA[
+      <!-- Note that this overwrites CLRTestBashPreCommands rather than adding to it. -->
+      <CLRTestBashPreCommands Condition="'$(CLRTestKind)' == 'BuildAndRun' and '$(TargetArchitecture)' == 'wasm'"><![CDATA[
 # Build wasm app containing the test dll
 __Command=""
 if [ ! -z ${__TestDotNetCmd+x} ] %3B then
@@ -292,7 +292,7 @@ export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=1
 $__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreAppCurrent=$(NetCoreAppCurrent) /p:TestAssemblyFileName=$(MsBuildProjectName).dll /p:TestBinDir=`pwd` $(CLRTestMSBuildArgs) || exit $?
 
    ]]>
-      </BashCLRTestPreCommands>
+      </CLRTestBashPreCommands>
 
       <BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And $(TargetOS) != 'Browser' And '$(TargetOS)' != 'Android' And '$(TargetArchitecture)' != 'arm64'">
     <![CDATA[
@@ -430,13 +430,8 @@ echo /usr/bin/env bash $(InputAssemblyName) %24(printf "'%s' " "${CLRTestExecuti
 CLRTestExitCode=$?
 CLRTestExpectedExitCode=0
       ]]></BashCLRTestLaunchCmds>
-
-      <BashCLRTestPostCommands><![CDATA[
-$(BashDisasmCheckPostCommands)
-$(CLRTestBashPostCommands)
-      ]]></BashCLRTestPostCommands>
-
     </PropertyGroup>
+
     <PropertyGroup>
       <BashEnvironmentVariables>
 @(CLRTestBashEnvironmentVariable -> 'export %(Identity)=%(Value)', '%0a')
@@ -548,11 +543,11 @@ ExePath=$(InputAssemblyName)
 export TestExclusionListPath=$CORE_ROOT/TestExclusionList.txt
 $(BashEnvironmentVariables)
 # PreCommands
-$(BashCLRTestPreCommands)
+$(CLRTestBashPreCommands)
 # Launch
 $(BashCLRTestLaunchCmds)
 # PostCommands
-$(BashCLRTestPostCommands)
+$(CLRTestBashPostCommands)
 $(BashCLRTestExitCodeCheck)
       ]]>
       </_CLRTestExecutionScriptText>
diff --git a/src/tests/Common/CLRTest.Execute.Batch.targets b/src/tests/Common/CLRTest.Execute.Batch.targets
index 014d160dd3b5c..00d2a3e66ec32 100644
--- a/src/tests/Common/CLRTest.Execute.Batch.targets
+++ b/src/tests/Common/CLRTest.Execute.Batch.targets
@@ -339,13 +339,8 @@ cmd /c $(InputAssemblyName)
 set CLRTestExitCode=!ERRORLEVEL!
 set CLRTestExpectedExitCode=0
       ]]></BatchCLRTestLaunchCmds>
-
-      <BatchCLRTestPostCommands><![CDATA[
-$(BatchDisasmCheckPostCommands)
-$(CLRTestBatchPostCommands)
-      ]]></BatchCLRTestPostCommands>
-
     </PropertyGroup>
+
     <PropertyGroup>
       <BatchEnvironmentVariables>
 @(CLRTestBatchEnvironmentVariable -> 'set %(Identity)=%(Value)', '%0d%0a')
@@ -453,7 +448,7 @@ $(CLRTestBatchPreCommands)
 REM Launch
 $(BatchCLRTestLaunchCmds)
 REM PostCommands
-$(BatchCLRTestPostCommands)
+$(CLRTestBatchPostCommands)
 $(BatchCLRTestExitCodeCheck)
       ]]></_CLRTestExecutionScriptText>
     </PropertyGroup>
diff --git a/src/tests/Common/CLRTest.GC.targets b/src/tests/Common/CLRTest.GC.targets
index f28eca4b99d02..678d3c0693a64 100644
--- a/src/tests/Common/CLRTest.GC.targets
+++ b/src/tests/Common/CLRTest.GC.targets
@@ -54,7 +54,7 @@ then
 fi
         ]]></GCSimulatorTestBashScript>
 
-        <BashCLRTestPreCommands>$(BashCLRTestPreCommands);$(GCLongGCTestBashScript);$(GCSimulatorTestBashScript)</BashCLRTestPreCommands>
+        <CLRTestBashPreCommands>$(CLRTestBashPreCommands);$(GCLongGCTestBashScript);$(GCSimulatorTestBashScript)</CLRTestBashPreCommands>
         <GCLongGCTestBatchScript Condition="'$(IsLongRunningGCTest)' != 'true'"><![CDATA[
 REM Long GC script
 if defined RunningLongGCTests (
diff --git a/src/tests/Common/CLRTest.Jit.targets b/src/tests/Common/CLRTest.Jit.targets
index a2b247437f16b..9bb5ce198e5af 100644
--- a/src/tests/Common/CLRTest.Jit.targets
+++ b/src/tests/Common/CLRTest.Jit.targets
@@ -55,8 +55,7 @@ export RunningIlasmRoundTrip=
 ]]>
       </IlasmRoundTripBashScript>
 
-      <IlasmRoundTripBashScript Condition="'$(CLRTestKind)' == 'BuildAndRun'">
-  <![CDATA[
+      <IlasmRoundTripBashScript Condition="'$(CLRTestKind)' == 'BuildAndRun'"><![CDATA[
 # IlasmRoundTrip Script
 # Disable Ilasm round-tripping for Linker tests.
 # Todo: Ilasm round-trip on linked binaries.
@@ -192,14 +191,13 @@ IF NOT DEFINED DoLink (
     </PropertyGroup>
   </Target>
 
-  <Target Name="GetDisasmCheckData"
-          Returns="$(HasDisasmCheck);@(DisasmCheckFiles)">
+  <Target Name="GetDisasmCheckData">
     <ItemGroup>
       <DisasmCheckFiles Include="%(Compile.Identity)" Condition="'%(Compile.HasDisasmCheck)' == 'true'" />
     </ItemGroup>
     <PropertyGroup>
       <HasDisasmCheck>false</HasDisasmCheck>
-      <HasDisasmCheck Condition="@(DisasmCheckFiles->Count()) &gt; 0 And '$(CLRTestKind)' == 'BuildAndRun' and '$(RunCrossGen2)' != '1'">true</HasDisasmCheck>
+      <HasDisasmCheck Condition="@(DisasmCheckFiles->Count()) &gt; 0 And '$(CLRTestKind)' == 'BuildAndRun'">true</HasDisasmCheck>
 
       <GCStressIncompatible Condition="'$(HasDisasmCheck)' == 'true'">true</GCStressIncompatible>
       <HeapVerifyIncompatible Condition="'$(HasDisasmCheck)' == 'true'">true</HeapVerifyIncompatible>
@@ -221,20 +219,16 @@ IF NOT DEFINED DoLink (
   </Target>
 
   <Target Name="GetDisasmCheckBashScript"
-          Returns="$(HasBashDisasmCheck);$(BashDisasmOutputFile);$(BashDisasmCheckPostCommands)"
           DependsOnTargets="GetDisasmCheckData">
     <PropertyGroup>
       <HasBashDisasmCheck>false</HasBashDisasmCheck>
       <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetOS)' == 'Linux' or '$(TargetOS)' == 'OSX') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>
 
-      <BashDisasmOutputFile>/dev/null</BashDisasmOutputFile>
       <BashDisasmOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BashDisasmOutputFile>
-
-      <BashDisasmListOutputFile>/dev/null</BashDisasmListOutputFile>
       <BashDisasmListOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BashDisasmListOutputFile>
 
-      <BashCLRTestPreCommands Condition="'$(HasBashDisasmCheck)' == 'true'"><![CDATA[
-$(BashCLRTestPreCommands)
+      <CLRTestBashPreCommands Condition="'$(HasBashDisasmCheck)' == 'true'"><![CDATA[
+$(CLRTestBashPreCommands)
 if [[ ( -z "$DOTNET_JitStress" ) && ( -z "$DOTNET_JitStressRegs" ) && ( -z "$DOTNET_TailcallStress" ) && ( "$DOTNET_TieredPGO" != "1" ) && ( -z "$RunCrossGen2" ) && ( -z "$DOTNET_JitForceControlFlowGuard" ) ]]; then
   @(DisasmCheckFiles -> '  dotnet $CORE_ROOT/SuperFileCheck/SuperFileCheck.dll --csharp-list-method-names "%(Identity)" --allow-unused-prefixes --check-prefixes=CHECK,$(TargetArchitecture.ToUpperInvariant()),$(TargetArchitecture.ToUpperInvariant())-$(TargetOS.ToUpperInvariant()) > "$(BashDisasmListOutputFile)"
     ERRORLEVEL=$?
@@ -248,10 +242,10 @@ if [[ ( -z "$DOTNET_JitStress" ) && ( -z "$DOTNET_JitStressRegs" ) && ( -z "$DOT
     fi', '%0a')
 fi
 ]]>
-      </BashCLRTestPreCommands>
+      </CLRTestBashPreCommands>
 
-      <BashDisasmCheckPostCommands></BashDisasmCheckPostCommands>
-      <BashDisasmCheckPostCommands Condition="'$(HasBashDisasmCheck)' == 'true'"><![CDATA[
+      <CLRTestBashPostCommands Condition="'$(HasBashDisasmCheck)' == 'true'"><![CDATA[
+$(CLRTestBashPostCommands)
 if [[ -n $DOTNET_JitDisasm ]]; then
   @(DisasmCheckFiles -> '  dotnet $CORE_ROOT/SuperFileCheck/SuperFileCheck.dll --csharp "%(Identity)" --allow-unused-prefixes --check-prefixes=CHECK,$(TargetArchitecture.ToUpperInvariant()),$(TargetArchitecture.ToUpperInvariant())-$(TargetOS.ToUpperInvariant()) --dump-input-context 40 --input-file "$(BashDisasmOutputFile)"
     ERRORLEVEL=$?
@@ -262,26 +256,22 @@ if [[ -n $DOTNET_JitDisasm ]]; then
     fi', '%0a')
 fi
 ]]>
-      </BashDisasmCheckPostCommands>
+      </CLRTestBashPostCommands>
     </PropertyGroup>
   </Target>
 
   <Target Name="GetDisasmCheckBatchScript"
-          Returns="$(HasBatchDisasmCheck);$(BatchDisasmOutputFile);$(BatchDisasmCheckPostCommands)"
           DependsOnTargets="GetDisasmCheckData">
     <PropertyGroup>
       <HasBatchDisasmCheck>false</HasBatchDisasmCheck>
       <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr'">true</HasBatchDisasmCheck>
 
-      <BatchDisasmOutputFile>NUL</BatchDisasmOutputFile>
       <BatchDisasmOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BatchDisasmOutputFile>
-
-      <BatchDisasmListOutputFile>NUL</BatchDisasmListOutputFile>
       <BatchDisasmListOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BatchDisasmListOutputFile>
 
       <CLRTestBatchPreCommands Condition="'$(HasBatchDisasmCheck)' == 'true'">
 <![CDATA[
-      $(CLRTestBatchPreCommands)
+$(CLRTestBatchPreCommands)
 IF "%DOTNET_JitStress%"=="" IF "%DOTNET_JitStressRegs%"=="" IF "%DOTNET_TailcallStress%"=="" IF NOT "%DOTNET_TieredPGO%" == "1" IF NOT "%RunCrossGen2%" == "1" IF "%DOTNET_JitForceControlFlowGuard%"=="" (
   @(DisasmCheckFiles -> '  dotnet %CORE_ROOT%\SuperFileCheck\SuperFileCheck.dll --csharp-list-method-names "%(Identity)" --check-prefixes=CHECK,$(TargetArchitecture.ToUpperInvariant()),$(TargetArchitecture.ToUpperInvariant())-$(TargetOS.ToUpperInvariant()) > "$(BatchDisasmListOutputFile)"
     IF NOT "!ERRORLEVEL!" == "0" (
@@ -295,8 +285,8 @@ IF "%DOTNET_JitStress%"=="" IF "%DOTNET_JitStressRegs%"=="" IF "%DOTNET_Tailcall
 ]]>
       </CLRTestBatchPreCommands>
 
-      <BatchDisasmCheckPostCommands></BatchDisasmCheckPostCommands>
-      <BatchDisasmCheckPostCommands Condition="'$(HasBatchDisasmCheck)' == 'true'"><![CDATA[
+      <CLRTestBatchPostCommands Condition="'$(HasBatchDisasmCheck)' == 'true'"><![CDATA[
+$(CLRTestBatchPostCommands)
 IF NOT "%DOTNET_JitDisasm%" == "" (
   @(DisasmCheckFiles -> '  dotnet %CORE_ROOT%\SuperFileCheck\SuperFileCheck.dll --csharp "%(Identity)" --allow-unused-prefixes --check-prefixes=CHECK,$(TargetArchitecture.ToUpperInvariant()),$(TargetArchitecture.ToUpperInvariant())-$(TargetOS.ToUpperInvariant()) --dump-input-context 40 --input-file "$(BatchDisasmOutputFile)"
     IF NOT "!ERRORLEVEL!" == "0" (
@@ -305,7 +295,7 @@ IF NOT "%DOTNET_JitDisasm%" == "" (
     )', '%0d%0a')
 )
 ]]>
-      </BatchDisasmCheckPostCommands>
+      </CLRTestBatchPostCommands>
     </PropertyGroup>
   </Target>
 
@@ -373,20 +363,9 @@ set DOTNET_JitPath=%CORE_ROOT%\superpmi-shim-collector.dll
   ***********************************************************************************************
   -->
 
-  <PropertyGroup Condition="$(RunWithGcStress) != ''" >
-    <CLRTestBatchPreCommands>
-<![CDATA[
-      $(CLRTestBatchPreCommands)
-set DOTNET_GCStress=$(RunWithGcStress)
-    ]]>
-    </CLRTestBatchPreCommands>
-    <BashCLRTestPreCommands>
-<![CDATA[
-      $(BashCLRTestPreCommands)
-export DOTNET_GCStress=$(RunWithGcStress)
-    ]]>
-    </BashCLRTestPreCommands>
-  </PropertyGroup>
-
+  <ItemGroup>
+    <CLRTestEnvironmentVariable Condition="'$(RunWithGcStress)' != ''"
+      Include="DOTNET_GCStress" Value="$(RunWithGcStress)" />
+  </ItemGroup>
 
 </Project> 
diff --git a/src/tests/GC/Regressions/Github/Runtime_76219/Runtime_76219.csproj b/src/tests/GC/Regressions/Github/Runtime_76219/Runtime_76219.csproj
index 4eec701f5a019..1ddf97612fbc5 100644
--- a/src/tests/GC/Regressions/Github/Runtime_76219/Runtime_76219.csproj
+++ b/src/tests/GC/Regressions/Github/Runtime_76219/Runtime_76219.csproj
@@ -11,12 +11,12 @@
       set DOTNET_GCStress=0x3
       set DOTNET_GCSegmentSize=8000
       ]]></CLRTestBatchPreCommands>
-          <BashCLRTestPreCommands><![CDATA[
-      $(BashCLRTestPreCommands)
+    <CLRTestBashPreCommands><![CDATA[
+      $(CLRTestBashPreCommands)
       export DOTNET_TieredCompilation=0
       export DOTNET_GCStress=0x3
       export DOTNET_GCSegmentSize=8000
-      ]]></BashCLRTestPreCommands>
+      ]]></CLRTestBashPreCommands>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj b/src/tests/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj
index ff81eb8f01a7c..12ea230fa9d4c 100644
--- a/src/tests/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj
+++ b/src/tests/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj
@@ -6,15 +6,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DllImportPathTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
+
     <CLRTestBashEnvironmentVariable Include="LD_LIBRARY_PATH" Value="$LD_LIBRARY_PATH:$%28pwd)/Subdirectory" />
   </ItemGroup>
   <PropertyGroup>
     <PathEnvSetupCommands><![CDATA[
       mkdir Subdirectory
       ]]></PathEnvSetupCommands>
-    <BashCLRTestPreCommands>$(BashCLRTestPreCommands);$(PathEnvSetupCommands)</BashCLRTestPreCommands>
+    <CLRTestBashPreCommands>$(CLRTestBashPreCommands);$(PathEnvSetupCommands)</CLRTestBashPreCommands>
   </PropertyGroup>
   <ItemGroup>
     <CMakeProjectReference Include="CMakeLists.txt" />
diff --git a/src/tests/JIT/PGO/InstrumentedTiers/InstrumentedTiers.csproj b/src/tests/JIT/PGO/InstrumentedTiers/InstrumentedTiers.csproj
index 0d7ec3d6e6470..9cd1526a84fe7 100644
--- a/src/tests/JIT/PGO/InstrumentedTiers/InstrumentedTiers.csproj
+++ b/src/tests/JIT/PGO/InstrumentedTiers/InstrumentedTiers.csproj
@@ -2,20 +2,12 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <Optimize>True</Optimize>
-    <CLRTestBatchPreCommands><![CDATA[
-      $(CLRTestBatchPreCommands)
-      set DOTNET_TieredCompilation=1
-      set DOTNET_TieredPGO=1
-      set DOTNET_TieredPGO_InstrumentOnlyHotCode=1
-      ]]></CLRTestBatchPreCommands>
-          <BashCLRTestPreCommands><![CDATA[
-      $(BashCLRTestPreCommands)
-      export DOTNET_TieredCompilation=1
-      export DOTNET_TieredPGO=1
-      export DOTNET_TieredPGO_InstrumentOnlyHotCode=1
-      ]]></BashCLRTestPreCommands>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="InstrumentedTiers.cs" />
+
+    <CLRTestBatchEnvironmentVariable Include="DOTNET_TieredCompilation" Value="1" />
+    <CLRTestBatchEnvironmentVariable Include="DOTNET_TieredPGO" Value="1" />
+    <CLRTestBatchEnvironmentVariable Include="DOTNET_TieredPGO_InstrumentOnlyHotCode" Value="1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_27924/GitHub_27924.csproj b/src/tests/JIT/Regression/JitBlue/GitHub_27924/GitHub_27924.csproj
index 89a2ea6cd06b6..2c26f5dc233c5 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_27924/GitHub_27924.csproj
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_27924/GitHub_27924.csproj
@@ -6,7 +6,9 @@
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
-  <PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildProjectName).cs" />
+
     <!-- This test requires GCStress to trigger the regression. Set DOTNET_GCStress here. However,
          not all CI platforms support GCStress. In particular, macOS and Alpine do not (currently).
          All Windows support GCStress. We don't have any way (currently) to determine if we're
@@ -14,12 +16,6 @@
          The test will run under GCStress in normal, scheduled GCStress runs, when only the supported
          platforms are run with GCStress.
     -->
-    <CLRTestBatchPreCommands><![CDATA[
-$(CLRTestBatchPreCommands)
-set DOTNET_GCStress=0xc
-]]></CLRTestBatchPreCommands>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildProjectName).cs" />
+    <CLRTestBatchEnvironmentVariable Include="DOTNET_GCStress" Value="0xc" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_45090/Runtime_45090.csproj b/src/tests/JIT/Regression/JitBlue/Runtime_45090/Runtime_45090.csproj
index 290364aada078..8711b8e3b4e4c 100644
--- a/src/tests/JIT/Regression/JitBlue/Runtime_45090/Runtime_45090.csproj
+++ b/src/tests/JIT/Regression/JitBlue/Runtime_45090/Runtime_45090.csproj
@@ -4,12 +4,10 @@
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <CLRTestBatchPreCommands><![CDATA[
-$(CLRTestBatchPreCommands)
-set DOTNET_GCStress=0xC
-]]></CLRTestBatchPreCommands>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
+
+    <CLRTestBatchEnvironmentVariable Include="DOTNET_GCStress" Value="0xC" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_75607/Runtime_75607.csproj b/src/tests/JIT/Regression/JitBlue/Runtime_75607/Runtime_75607.csproj
index 9a3423ff0d39b..96125a52c7eae 100644
--- a/src/tests/JIT/Regression/JitBlue/Runtime_75607/Runtime_75607.csproj
+++ b/src/tests/JIT/Regression/JitBlue/Runtime_75607/Runtime_75607.csproj
@@ -6,19 +6,10 @@
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
-  <PropertyGroup>
-    <CLRTestBatchPreCommands><![CDATA[
-$(CLRTestBatchPreCommands)
-set COMPlus_TieredPGO=1
-set COMPlus_TC_QuickJitForLoops=1
-]]></CLRTestBatchPreCommands>
-    <BashCLRTestPreCommands><![CDATA[
-$(BashCLRTestPreCommands)
-export COMPlus_TieredPGO=1
-export COMPlus_TC_QuickJitForLoops=1
-]]></BashCLRTestPreCommands>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
+
+    <CLRTestEnvironmentVariable Include="DOTNET_TieredPGO" Value="1" />
+    <CLRTestEnvironmentVariable Include="DOTNET_TC_QuickJitForLoops" Value="1" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/SIMD/Directory.Build.props b/src/tests/JIT/SIMD/Directory.Build.props
index 08825dc33d9cf..05722100b653f 100644
--- a/src/tests/JIT/SIMD/Directory.Build.props
+++ b/src/tests/JIT/SIMD/Directory.Build.props
@@ -5,17 +5,19 @@
     <CLRTestBatchPreCommands>
       <![CDATA[
 $(CLRTestBatchPreCommands)
-set DOTNET_JitFuncInfoLogFile=SIMD.log
 if EXIST SIMD.log (del SIMD.log)
 ]]>
     </CLRTestBatchPreCommands>
-    <BashCLRTestPreCommands>
+    <CLRTestBashPreCommands>
       <![CDATA[
-$(BashCLRTestPreCommands)
-export DOTNET_JitFuncInfoLogFile=SIMD.log
+$(CLRTestBashPreCommands)
 rm -f SIMD.log
 ]]>
-    </BashCLRTestPreCommands>
+    </CLRTestBashPreCommands>
   </PropertyGroup>
 
+  <ItemGroup>
+    <CLRTestBashEnvironmentVariable Include="DOTNET_JitFuncInfoLogFile" Value="SIMD.log" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/tests/Loader/NativeLibs/FromNativePaths.csproj b/src/tests/Loader/NativeLibs/FromNativePaths.csproj
index 5af2b1609881b..4d3443fd8626a 100644
--- a/src/tests/Loader/NativeLibs/FromNativePaths.csproj
+++ b/src/tests/Loader/NativeLibs/FromNativePaths.csproj
@@ -21,7 +21,7 @@
     <PathEnvSetupCommands><![CDATA[
       mkdir Subdirectory
       ]]></PathEnvSetupCommands>
-    <BashCLRTestPreCommands>$(BashCLRTestPreCommands);$(PathEnvSetupCommands)</BashCLRTestPreCommands>
-    <CLRTestBatchPreCommands>$(BatchCLRTestPreCommands);$(PathEnvSetupCommands)</CLRTestBatchPreCommands>
+    <CLRTestBashPreCommands>$(CLRTestBashPreCommands);$(PathEnvSetupCommands)</CLRTestBashPreCommands>
+    <CLRTestBatchPreCommands>$(CLRTestBatchPreCommands);$(PathEnvSetupCommands)</CLRTestBatchPreCommands>
   </PropertyGroup>
 </Project>
diff --git a/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj b/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj
index 72843c761037c..324e64fe7dbbf 100644
--- a/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj
+++ b/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj
@@ -38,8 +38,8 @@ set "COMPlus_ReadyToRun="
 endlocal
 set CLRCustomTestLauncher=RunBasicTestWithMcj.cmd --runCustomTest
 ]]></CLRTestBatchPreCommands>
-    <BashCLRTestPreCommands><![CDATA[
-$(BashCLRTestPreCommands)
+    <CLRTestBashPreCommands><![CDATA[
+$(CLRTestBashPreCommands)
 mkdir r2r
 
 # Suppress some DOTNET and COMPlus variables for the duration of Crossgen2 execution
@@ -52,6 +52,6 @@ export DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
 export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun
 chmod +x ./RunBasicTestWithMcj.sh
 export CLRCustomTestLauncher="./RunBasicTestWithMcj.sh --runCustomTest"
-]]></BashCLRTestPreCommands>
+]]></CLRTestBashPreCommands>
   </PropertyGroup>
 </Project>
diff --git a/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/x64Vex.csproj b/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/x64Vex.csproj
index b14f7c618632c..983436eab7d79 100644
--- a/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/x64Vex.csproj
+++ b/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/x64Vex.csproj
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <BashCLRTestPreCommands><![CDATA[
-$(BashCLRTestPreCommands)
+    <CLRTestBashPreCommands><![CDATA[
+$(CLRTestBashPreCommands)
     if [[ "$OSTYPE" == "darwin"* ]]; then
         sysctl -a
 
@@ -30,7 +30,7 @@ $(BashCLRTestPreCommands)
           exit 0
         fi
     fi
-]]></BashCLRTestPreCommands>
+]]></CLRTestBashPreCommands>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/tests/nativeaot/SmokeTests/SharedLibrary/SharedLibrary.csproj b/src/tests/nativeaot/SmokeTests/SharedLibrary/SharedLibrary.csproj
index 061aad6ed159d..09b36ffbd9fb7 100644
--- a/src/tests/nativeaot/SmokeTests/SharedLibrary/SharedLibrary.csproj
+++ b/src/tests/nativeaot/SmokeTests/SharedLibrary/SharedLibrary.csproj
@@ -14,11 +14,11 @@ mkdir native 2>nul
 copy /y SharedLibraryDriver.exe native\SharedLibrary.exe
 ]]></CLRTestBatchPreCommands>
 
-    <BashCLRTestPreCommands><![CDATA[
-$(BashCLRTestPreCommands)
+    <CLRTestBashPreCommands><![CDATA[
+$(CLRTestBashPreCommands)
 mkdir -p native
 cp SharedLibraryDriver native/SharedLibrary
-]]></BashCLRTestPreCommands>
+]]></CLRTestBashPreCommands>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/tests/readytorun/determinism/crossgen2determinism.csproj b/src/tests/readytorun/determinism/crossgen2determinism.csproj
index b1f3f366e3fc6..c0219b2b48594 100644
--- a/src/tests/readytorun/determinism/crossgen2determinism.csproj
+++ b/src/tests/readytorun/determinism/crossgen2determinism.csproj
@@ -19,12 +19,12 @@ set CoreRT_DeterminismSeed=1
 set CoreRT_DeterminismSeed=2
 %Core_Root%\CoreRun.exe %Core_Root%\crossgen2\crossgen2.dll --map -r:%Core_Root%\*.dll -r:..\..\crossgen2\crossgen2smoke\helperdll.dll -r:..\..\crossgen2\crossgen2smoke\helperildll.dll -o:crossgen2smoke2.ildll ..\..\crossgen2\crossgen2smoke\crossgen2smoke.dll
 ]]></CLRTestBatchPreCommands>
-    <BashCLRTestPreCommands><![CDATA[
-$(BashCLRTestPreCommands)
+    <CLRTestBashPreCommands><![CDATA[
+$(CLRTestBashPreCommands)
 export CoreRT_DeterminismSeed=1
 $CORE_ROOT/corerun $CORE_ROOT/crossgen2/crossgen2.dll --map -r:$CORE_ROOT/*.dll -r:../../crossgen2/crossgen2smoke/helperdll.dll -r:../../crossgen2/crossgen2smoke/helperildll.dll -o:crossgen2smoke1.ildll ../../crossgen2/crossgen2smoke/crossgen2smoke.dll
 export CoreRT_DeterminismSeed=2
 $CORE_ROOT/corerun $CORE_ROOT/crossgen2/crossgen2.dll --map -r:$CORE_ROOT/*.dll -r:../../crossgen2/crossgen2smoke/helperdll.dll -r:../../crossgen2/crossgen2smoke/helperildll.dll -o:crossgen2smoke2.ildll ../../crossgen2/crossgen2smoke/crossgen2smoke.dll
-]]></BashCLRTestPreCommands>
+]]></CLRTestBashPreCommands>
   </PropertyGroup>
 </Project>
diff --git a/src/tests/readytorun/multifolder/multifolder.csproj b/src/tests/readytorun/multifolder/multifolder.csproj
index d201bd7f295d6..d621dbd8d17fa 100644
--- a/src/tests/readytorun/multifolder/multifolder.csproj
+++ b/src/tests/readytorun/multifolder/multifolder.csproj
@@ -73,8 +73,8 @@ $(CLRTestBatchPreCommands)
     set DOTNET_GCName=!__gcStandaloneModeToRestore!
 
 ]]></CLRTestBatchPreCommands>
-    <BashCLRTestPreCommands><![CDATA[
-$(BashCLRTestPreCommands)
+    <CLRTestBashPreCommands><![CDATA[
+$(CLRTestBashPreCommands)
 
     __OutputDir=$PWD
     __ResponseFile=$__OutputDir/multifolder.rsp
@@ -116,6 +116,6 @@ $(BashCLRTestPreCommands)
     ExePath=multifolder/multifolder.dll
     export DOTNET_NativeImageSearchPaths=$__OutputDir
 
-]]></BashCLRTestPreCommands>
+]]></CLRTestBashPreCommands>
   </PropertyGroup>
 </Project>
diff --git a/src/tests/readytorun/r2rdump/BasicTests/R2RDumpTest.csproj b/src/tests/readytorun/r2rdump/BasicTests/R2RDumpTest.csproj
index b76ca5634bd9a..39d38e62ffd5d 100644
--- a/src/tests/readytorun/r2rdump/BasicTests/R2RDumpTest.csproj
+++ b/src/tests/readytorun/r2rdump/BasicTests/R2RDumpTest.csproj
@@ -41,8 +41,8 @@ $(DotnetToolCommand) $(R2RDumpCommand) --in GcInfoTransitions.ni.dll --out GcInf
 $(DotnetToolCommand) $(R2RDumpCommand) --in GenericFunctions.ni.dll --out GenericFunctions-test.xml -x -v --ignoreSensitive
 $(DotnetToolCommand) $(R2RDumpCommand) --in MultipleRuntimeFunctions.ni.dll --out MultipleRuntimeFunctions-test.xml -x -v --ignoreSensitive
 ]]></CLRTestBatchPreCommands>
-    <BashCLRTestPreCommands><![CDATA[
-$(BashCLRTestPreCommands)
+    <CLRTestBashPreCommands><![CDATA[
+$(CLRTestBashPreCommands)
 $CORE_ROOT/crossgen -readytorun -platform_assemblies_paths $CORE_ROOT:`pwd` -out HelloWorld.ni.dll HelloWorld.dll
 $CORE_ROOT/crossgen -readytorun -platform_assemblies_paths $CORE_ROOT:`pwd` -out GcInfoTransitions.ni.dll GcInfoTransitions.dll
 $CORE_ROOT/crossgen -readytorun -platform_assemblies_paths $CORE_ROOT:`pwd` -out GenericFunctions.ni.dll GenericFunctions.dll
@@ -51,6 +51,6 @@ $(BashDotnetToolCommand) $(BashR2RDumpCommand) --in HelloWorld.ni.dll --out Hell
 $(BashDotnetToolCommand) $(BashR2RDumpCommand) --in GcInfoTransitions.ni.dll --out GcInfoTransitions-test.xml -x -v --ignoreSensitive
 $(BashDotnetToolCommand) $(BashR2RDumpCommand) --in GenericFunctions.ni.dll --out GenericFunctions-test.xml -x -v --ignoreSensitive
 $(BashDotnetToolCommand) $(BashR2RDumpCommand) --in MultipleRuntimeFunctions.ni.dll --out MultipleRuntimeFunctions-test.xml -x -v --ignoreSensitive
-]]></BashCLRTestPreCommands>
+]]></CLRTestBashPreCommands>
   </PropertyGroup>
 </Project>
diff --git a/src/tests/readytorun/tests/mainv1.csproj b/src/tests/readytorun/tests/mainv1.csproj
index 12c36cc90feaa..eae10d7f64239 100644
--- a/src/tests/readytorun/tests/mainv1.csproj
+++ b/src/tests/readytorun/tests/mainv1.csproj
@@ -85,8 +85,8 @@ if not exist mainv1.map (
 
 endlocal
 ]]></CLRTestBatchPreCommands>
-    <BashCLRTestPreCommands><![CDATA[
-$(BashCLRTestPreCommands)
+    <CLRTestBashPreCommands><![CDATA[
+$(CLRTestBashPreCommands)
 
 # Suppress some DOTNET and COMPlus variables for the duration of Crossgen2 execution
 export -n DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
@@ -157,6 +157,6 @@ then
 fi
 
 export DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
-]]></BashCLRTestPreCommands>
+]]></CLRTestBashPreCommands>
   </PropertyGroup>
 </Project>
diff --git a/src/tests/readytorun/tests/mainv2.csproj b/src/tests/readytorun/tests/mainv2.csproj
index 3c9e2ec841255..eaf35fd22d967 100644
--- a/src/tests/readytorun/tests/mainv2.csproj
+++ b/src/tests/readytorun/tests/mainv2.csproj
@@ -85,8 +85,8 @@ if not exist mainv2.map (
 
 endlocal
 ]]></CLRTestBatchPreCommands>
-    <BashCLRTestPreCommands><![CDATA[
-$(BashCLRTestPreCommands)
+    <CLRTestBashPreCommands><![CDATA[
+$(CLRTestBashPreCommands)
 
 # Suppress some DOTNET and COMPlus variables for the duration of Crossgen2 execution
 export -n DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
@@ -158,6 +158,6 @@ then
 fi
 
 export DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
-]]></BashCLRTestPreCommands>
+]]></CLRTestBashPreCommands>
   </PropertyGroup>
 </Project>