diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 7c668b03471249..e3efcd584ce4f0 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -115,11 +115,11 @@
        setting up the per-scenario environment.
   -->
 
-  <ItemGroup Condition=" '$(TargetOS)' == 'windows' ">
+  <ItemGroup Condition="'$(WindowsShell)' == 'true'">
     <HelixPreCommand Include="set __TestArchitecture=$(TargetArchitecture)" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetOS)' != 'windows' ">
+  <ItemGroup Condition="'$(WindowsShell)' != 'true'">
     <HelixPreCommand Include="export __TestArchitecture=$(TargetArchitecture)" />
   </ItemGroup>