diff --git a/System.ServiceModel.sln b/System.ServiceModel.sln
index 6f61be3e3762..f2e998c82cff 100644
--- a/System.ServiceModel.sln
+++ b/System.ServiceModel.sln
@@ -89,6 +89,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Binding.UDS.IntegrationTest
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.NetNamedPipe.Tests", "src\System.ServiceModel.NetNamedPipe\tests\System.ServiceModel.NetNamedPipe.Tests.csproj", "{FD188537-21AF-48C5-84FF-F8758F4C42A8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfHostedCoreWCFService", "src\System.Private.ServiceModel\tools\SelfHostedCoreWcfService\SelfHostedCoreWCFService.csproj", "{D89D949F-254B-4A29-AE78-DEB081ACA601}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -259,6 +261,10 @@ Global
 		{FD188537-21AF-48C5-84FF-F8758F4C42A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD188537-21AF-48C5-84FF-F8758F4C42A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD188537-21AF-48C5-84FF-F8758F4C42A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D89D949F-254B-4A29-AE78-DEB081ACA601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D89D949F-254B-4A29-AE78-DEB081ACA601}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D89D949F-254B-4A29-AE78-DEB081ACA601}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D89D949F-254B-4A29-AE78-DEB081ACA601}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/eng/SendToHelix.proj b/eng/SendToHelix.proj
index d08b731dcb66..af56e7f6edfd 100644
--- a/eng/SendToHelix.proj
+++ b/eng/SendToHelix.proj
@@ -15,10 +15,6 @@
     <EnableXUnitReporter>true</EnableXUnitReporter>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(RunWithCoreWcfService)' == 'true' " >
-    <ProjectReference Include="..\src\System.Private.ServiceModel\tools\SelfHostedCoreWcfService\SelfHostedCoreWCFService.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <XUnitProject Include="..\src\System.Private.ServiceModel\tests\Scenarios\**\*.IntegrationTests.csproj">
       <TargetFramework>$(XUnitPublishTargetFramework)</TargetFramework>
@@ -59,12 +55,14 @@
     <Creator Condition=" '$(Creator)' == ''">anon</Creator>
   </PropertyGroup>
   
-  <PropertyGroup Condition=" '$(RunWithCoreWcfService)' == 'true' AND !$(HelixTargetQueue.StartsWith('Windows'))" >
-    <HelixPreCommands>$(HelixPreCommands);sh $(MSBuildThisFileDirectory)/../artifacts/bin/SelfHostedCoreWCFService/SelfHostedCoreWCFService bootstrap:true</HelixPreCommands>
+  <PropertyGroup Condition=" '$(RunWithCoreWcfService)' == 'true' AND $(HelixTargetQueue.StartsWith('Linux'))" >
+    <HelixPreCommands>$(HelixPreCommands);sh $(MSBuildThisFileDirectory)../artifacts/bin/SelfHostedCoreWCFService/SelfHostedCoreWCFService bootstrap:true</HelixPreCommands>
   </PropertyGroup>
   
-  <PropertyGroup Condition=" '$(RunWithCoreWcfService)' == 'true' AND $(HelixTargetQueue.StartsWith('Windows'))" >
-    <HelixPreCommands>$(HelixPreCommands);$(MSBuildThisFileDirectory)/../artifacts/bin/SelfHostedCoreWCFService/SelfHostedCoreWCFService.exe bootstrap:true</HelixPreCommands>
+  <PropertyGroup>
+    <HelixPreCommands>$(HelixPreCommands);ls;</HelixPreCommands>
+	<HelixPreCommands>$(HelixPreCommands);dir /s /b /o:gn ;</HelixPreCommands>
+	<HelixPreCommands>$(HelixPreCommands);$(MSBuildThisFileDirectory)\..\artifacts\bin\SelfHostedCoreWCFService\SelfHostedCoreWCFService bootstrap:true</HelixPreCommands>
   </PropertyGroup>
 
   <PropertyGroup Condition="!$(HelixTargetQueue.StartsWith('Windows'))">
diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/Infrastructure.Common.csproj b/src/System.Private.ServiceModel/tests/Common/Infrastructure/Infrastructure.Common.csproj
index 451a005ad5b0..85795863bc58 100644
--- a/src/System.Private.ServiceModel/tests/Common/Infrastructure/Infrastructure.Common.csproj
+++ b/src/System.Private.ServiceModel/tests/Common/Infrastructure/Infrastructure.Common.csproj
@@ -8,6 +8,7 @@
   
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\System.ServiceModel.Primitives\src\System.ServiceModel.Primitives.csproj" />
+    <ProjectReference Include="..\..\..\tools\SelfHostedCoreWcfService\SelfHostedCoreWCFService.csproj" />
     <PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsVersion)" />