diff --git a/Directory.Build.props b/Directory.Build.props
index 44dac8136f11..cc9593f39db0 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -50,19 +50,14 @@
     <ProjectAssetsFile Condition="'$(ProjectAssetsFile)' == 'unused'"></ProjectAssetsFile>
   </PropertyGroup>
 
-  <Import Project="C:\git\arcade\src\Microsoft.DotNet.CoreFxTesting\build\Microsoft.DotNet.CoreFxTesting.props" />
-
   <!-- Common repo directories -->
   <PropertyGroup>
     <!-- Properties to remove with buildtools removal -->
     <ProjectDir>$(RepoRoot)</ProjectDir>
     <BinDir>$(ProjectDir)artifacts\bin\</BinDir>
 
-    <SourceDir>$(ProjectDir)src\</SourceDir>
-
-    <!-- CoreFx sepcific paths -->
-    <GlobalToolsDir>$(ProjectDir)artifacts/tools/</GlobalToolsDir>
-    <TestWorkingDir Condition="'$(TestWorkingDir)'==''">$(BinDir)tests/</TestWorkingDir>
+    <!-- Use msbuild path functions as that property is used in bash scripts. -->
+    <SourceDir>$([MSBuild]::NormalizeDirectory('$(ProjectDir)', 'src'))</SourceDir>
 
     <!-- Input Directories -->
     <PackagesDir>$(DotNetRestorePackagesPath)</PackagesDir>
@@ -111,7 +106,7 @@
 
   <!-- Enable the analyzers for this repo -->
   <PropertyGroup>
-    <EnableAnalyzers Condition="'$(EnableAnalyzers)'=='' AND '$(IsSourceProject)' == 'true'">true</EnableAnalyzers>
+    <EnableAnalyzers Condition="'$(EnableAnalyzers)' == '' AND '$(IsSourceProject)' == 'true'">true</EnableAnalyzers>
   </PropertyGroup>
 
   <!-- Default properties for CI builds -->
@@ -122,7 +117,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OfficialBuildId)' == ''">
     <!-- Disable F5 and test explorer support for CI builds. -->
-    <GenerateLaunchSettings>false</GenerateLaunchSettings>
+    <EnableLaunchSettings>false</EnableLaunchSettings>
     <EnableVSTestReferences>false</EnableVSTestReferences>
   </PropertyGroup>
 
@@ -264,21 +259,8 @@
     <DisableArcadeTestFramework>true</DisableArcadeTestFramework>
   </PropertyGroup>
 
-  <!-- TODO: Remove with Arcade update. -->
-  <PropertyGroup>
-    <_IsTestProjectBefore>$(IsTestProject)</_IsTestProjectBefore>
-    <_IsPerformanceTestProjectBefore>$(IsPerformanceTestProject)</_IsPerformanceTestProjectBefore>
-  </PropertyGroup>
-
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
-  <!-- Need to reset our definition of IsTestProject after arcade sdk import -->
-  <!-- TODO: Remove with Arcade update. -->
-  <PropertyGroup>
-    <IsTestProject>$(_IsTestProjectBefore)</IsTestProject>
-    <IsPerformanceTestProject>$(_IsPerformanceTestProjectBefore)</IsPerformanceTestProject>
-  </PropertyGroup>
-
   <!-- Set the kind of PDB to Portable and turn on SourceLink (fetching source from GitHub) -->
   <PropertyGroup>
     <!-- Always pass portable to override arcade sdk which uses embedded for local builds -->
@@ -363,6 +345,7 @@
 
     <RuntimePath Condition="'$(RuntimePath)' == ''">$(BinDir)runtime/$(BuildConfiguration)/</RuntimePath>
     <ShimsTargetRuntimeRoot>$(BinDir)shimsTargetRuntime/</ShimsTargetRuntimeRoot>
+    <TestWorkingDir Condition="'$(TestWorkingDir)'==''">$(ArtifactsBinDir)tests/</TestWorkingDir>
     <TestPath Condition="'$(TestPath)' == ''">$(TestWorkingDir)$(MSBuildProjectName)/$(BuildConfiguration)/</TestPath>
     <RefRootPath>$(BinDir)ref/</RefRootPath>
     <BuildConfigurationRefPath>$(RefRootPath)$(_bc_TargetGroup)/</BuildConfigurationRefPath>
@@ -372,8 +355,9 @@
     <NetStandardRefPath>$(RefRootPath)netstandard/</NetStandardRefPath>
     <NetFxRefPath>$(RefRootPath)netfx/</NetFxRefPath>
     <TestArchiveRoot>$(ProjectDir)artifacts/helix/</TestArchiveRoot>
-    <TestArchiveTestsDir>$(TestArchiveRoot)tests/</TestArchiveTestsDir>
+    <TestArchiveTestsDir>$(TestArchiveRoot)tests/$(BuildConfiguration)/</TestArchiveTestsDir>
     <TestArchiveRuntimeDir>$(TestArchiveRoot)runtime/$(BuildConfiguration)/</TestArchiveRuntimeDir>
+    <GlobalToolsDir>$(ArtifactsDir)tools/</GlobalToolsDir>
 
     <!-- project file to use when resolving ReferenceFromRuntime items -->
     <RuntimeProjectFile Condition="'$(RuntimeProjectFile)' == ''">$(ProjectDir)\external\runtime\runtime.depproj</RuntimeProjectFile>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index c9c4fd9aa230..217b610cf39e 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -149,8 +149,6 @@
 
   <Import Project="$(ToolSetCommonDirectory)Tools.proj.nuget.g.targets" Condition="Exists('$(ToolSetCommonDirectory)Tools.proj.nuget.g.targets')" />
 
-  <Import Project="C:\git\arcade\src\Microsoft.DotNet.CoreFxTesting\build\Microsoft.DotNet.CoreFxTesting.targets" />
-
   <!-- permit a wrapping build system to contribute targets to this build -->
   <Import Condition="Exists('$(MSBuildThisFileDirectory)..\open.targets')" Project="$(MSBuildThisFileDirectory)..\open.targets" />
 
diff --git a/Documentation/building/code-coverage.md b/Documentation/building/code-coverage.md
index 1e780edcbc02..d5ebbe2e0da7 100644
--- a/Documentation/building/code-coverage.md
+++ b/Documentation/building/code-coverage.md
@@ -22,7 +22,7 @@ Our default, somewhat-arbitrary initial goal for a library is 90% code coverage.
 
 Issues are opened for a library when a cursory examination of its code coverage reveal that there are likely still some meaningful gaps that need to be addressed.  We welcome contributions to our test suites to help address these gaps and close these issues.  Many of these issues are marked as [up-for-grabs](https://github.com/dotnet/corefx/labels/up-for-grabs).
 
-An issue need not be addressed in its entirety.  We happily accept contributions that improve our tests and work towards improving code coverage numbers even if they only incrementally improve the situation.
+An issue need not be addressed in its entirety. We happily accept contributions that improve our tests and work towards improving code coverage numbers even if they only incrementally improve the situation.
 
 ## Automated Code Coverage Runs
 
diff --git a/eng/Tools.props b/eng/Tools.props
index 1cd35cd089e4..2f14b2784e1a 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -27,6 +27,7 @@
     <PackageReference Include="Microsoft.DotNet.GenAPI" Version="$(MicrosoftDotNetGenApiPackageVersion)" />
     <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesPackageVersion)" />
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingPackageVersion)" />
+    <PackageReference Include="Microsoft.DotNet.CoreFxTesting" Version="$(MicrosoftDotNetCoreFxTestingPackageVersion)" />
 
     <!-- Include the SourceLink packages -->
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
diff --git a/eng/Versions.props b/eng/Versions.props
index 75fe48eeba9f..d621507ab99f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,5 +21,6 @@
     <MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.18578.2</MicrosoftDotNetGenFacadesPackageVersion>
     <MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.18578.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
     <MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.18578.2</MicrosoftDotNetBuildTasksPackagingPackageVersion>
+    <MicrosoftDotNetCoreFxTestingPackageVersion>1.0.0-beta.18603.8</MicrosoftDotNetCoreFxTestingPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/eng/dependencies.props b/eng/dependencies.props
index 7946cc4d271f..3eb74e1655f1 100644
--- a/eng/dependencies.props
+++ b/eng/dependencies.props
@@ -47,7 +47,7 @@
     <RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
 
     <!-- xunit test dependency version  -->
-    <MicrosoftNetTestSdkPackageVersion>15.8.0</MicrosoftNetTestSdkPackageVersion>
+    <MicrosoftNetTestSdkPackageVersion>16.0.0-preview-20181128-01</MicrosoftNetTestSdkPackageVersion>
     <XUnitPackageVersion>2.4.1-pre.build.4059</XUnitPackageVersion>
     <XUnitPerformancePackageVersion>1.0.0-beta-build0020</XUnitPerformancePackageVersion>
     <TraceEventPackageVersion>2.0.5</TraceEventPackageVersion>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index e82d0d460ead..b3269a936bc9 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -19,9 +19,10 @@
     <AssemblySearchPaths>$(AssemblySearchPaths);$(RefPath);{RawFileName}</AssemblySearchPaths>
   </PropertyGroup>
 
+  <!-- Use msbuild path functions as that property is used in bash scripts. -->
   <ItemGroup>
-    <CoverageExcludeFile Include="$(SourceDir)Common/src/System/SR.*" />
-    <CoverageExcludeFile Include="$(SourceDir)Common/src/System/NotImplemented.cs" />
+    <CoverageExcludeFile Include="$([MSBuild]::NormalizePath('$(SourceDir)', 'Common', 'src', 'System', 'SR.*'))" />
+    <CoverageExcludeFile Include="$([MSBuild]::NormalizePath('$(SourceDir)', 'Common', 'src', 'System', 'NotImplemented.cs'))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -29,4 +30,10 @@
     <CoverageProbePath Include="shared\Microsoft.NETCore.App\9.9.9\il" />
     <CoverageProbePath Include="shared\Microsoft.NETCore.App\9.9.9" />
   </ItemGroup>
+
+  <!-- Transform CI paths in System.Private.CoreLib.pdb with local path for shared CoreLib files. -->
+  <PropertyGroup>
+    <CoverageTransformSource>fullPath=&quot;&quot;.*System\.Private\.CoreLib\\shared</CoverageTransformSource>
+    <CoverageTransformDestination>fullPath=&quot;&quot;&quot;&quot;$(CommonPath)\CoreLib</CoverageTransformDestination>
+  </PropertyGroup>
 </Project>
diff --git a/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj b/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj
index ac4609130c31..679018491c98 100644
--- a/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj
+++ b/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj
@@ -98,7 +98,7 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' != 'netstandard'">
     <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. -->
-    <TargetingPackExclusions Include="System.Collections.Immutable" />
+    <DefaultReferenceExclusions Include="System.Collections.Immutable" />
     <ReferenceFromRuntime Include="System.Collections.Immutable" />
     <Compile Include="ImmutableListTestBase.cs" />
     <Compile Include="ImmutableListTest.cs" />
diff --git a/src/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj b/src/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
index 99f62f78e27f..7907b51afa68 100644
--- a/src/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
+++ b/src/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. -->
-    <TargetingPackExclusions Include="System.ComponentModel.Composition.Registration" />
+    <DefaultReferenceExclusions Include="System.ComponentModel.Composition.Registration" />
     <ReferenceFromRuntime Include="System.ComponentModel.Composition.Registration" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj b/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
index bbe773682cde..e9678bf6638a 100644
--- a/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
+++ b/src/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. -->
-    <TargetingPackExclusions Include="System.ComponentModel.Composition" />
+    <DefaultReferenceExclusions Include="System.ComponentModel.Composition" />
     <ReferenceFromRuntime Include="System.ComponentModel.Composition" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/System.ComponentModel.TypeConverter/tests/AddingNewEventArgsTests.cs b/src/System.ComponentModel.TypeConverter/tests/AddingNewEventArgsTests.cs
index 027e0735a863..2c8d529129b4 100644
--- a/src/System.ComponentModel.TypeConverter/tests/AddingNewEventArgsTests.cs
+++ b/src/System.ComponentModel.TypeConverter/tests/AddingNewEventArgsTests.cs
@@ -8,6 +8,12 @@ namespace System.ComponentModel.Tests
 {
     public class AddingNewEventArgsTests
     {
+        [Fact]
+        public void C()
+        {
+            var x = TypeDescriptor.GetConverter(typeof(Nullable<Boolean>));
+        }
+
         [Fact]
         public void Ctor_Default()
         {
diff --git a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
index ef77ea42d71b..ccc07a1d34bc 100644
--- a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
+++ b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
@@ -9,7 +9,7 @@
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
-    <TargetingPackExclusions Include="System.Diagnostics.Debug" />
+    <DefaultReferenceExclusions Include="System.Diagnostics.Debug" />
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
     <ReferenceFromRuntime Include="System.Runtime" />
     <ReferenceFromRuntime Include="System.Threading" />
diff --git a/src/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj b/src/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj
index 133b1daff5eb..931c7fa0e468 100644
--- a/src/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj
+++ b/src/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetGroup)' != 'netstandard'">
     <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. -->
-    <TargetingPackExclusions Include="System.IO.Pipelines" />
+    <DefaultReferenceExclusions Include="System.IO.Pipelines" />
     <ReferenceFromRuntime Include="System.IO.Pipelines" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
index 3083cd763fab..e54845679c3d 100644
--- a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
+++ b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
@@ -12,7 +12,7 @@
     <IncludeDefaultReferences>false</IncludeDefaultReferences>
   </PropertyGroup>
   <ItemGroup>
-    <TargetingPackExclusions Include="System.Linq.Expressions" />
+    <DefaultReferenceExclusions Include="System.Linq.Expressions" />
     <ReferenceFromRuntime Include="System.Linq.Expressions" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
index e75c8d828a49..a70851159ea8 100644
--- a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
+++ b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
@@ -7,7 +7,7 @@
     <Configurations>netstandard-Windows_NT-Debug;netstandard-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <TargetingPackExclusions Include="System.Net.Http.WinHttpHandler" />
+    <DefaultReferenceExclusions Include="System.Net.Http.WinHttpHandler" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
     <Compile Include="$(CommonTestPath)\System\Net\SslProtocolSupport.cs">
diff --git a/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
index 5fe36883c3b2..cb8772830d70 100644
--- a/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
+++ b/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
   <ItemGroup>
-    <TargetingPackExclusions Include="System.Net.Http" />
-    <TargetingPackExclusions Include="System.Net.Mail" />
+    <DefaultReferenceExclusions Include="System.Net.Http" />
+    <DefaultReferenceExclusions Include="System.Net.Mail" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)\System\NotImplemented.cs">
diff --git a/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
index 30ad853f25f7..eb0faecb2113 100644
--- a/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
+++ b/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
   <ItemGroup>
-    <TargetingPackExclusions Include="System.Net.Mail" />
+    <DefaultReferenceExclusions Include="System.Net.Mail" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\src\System\Net\Base64Stream.cs">
diff --git a/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
index ba2fc45c19aa..70c95c621c5d 100644
--- a/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
+++ b/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
   <ItemGroup>
-    <TargetingPackExclusions Include="System.Net.NameResolution" />
+    <DefaultReferenceExclusions Include="System.Net.NameResolution" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
     <Compile Include="..\..\src\System\Net\IPHostEntry.cs">
diff --git a/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
index 5f3410d7ae14..ccc4d27c1930 100644
--- a/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
+++ b/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
   <ItemGroup>
-    <TargetingPackExclusions Include="System.Net.NameResolution" />
+    <DefaultReferenceExclusions Include="System.Net.NameResolution" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\src\System\Net\IPHostEntry.cs">
diff --git a/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
index 061bd928a46a..c9556ab771e8 100644
--- a/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
+++ b/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
   <ItemGroup>
-    <TargetingPackExclusions Include="System.Net.Primitives" />
+    <DefaultReferenceExclusions Include="System.Net.Primitives" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\src\System\Net\Sockets\AddressFamily.cs">
diff --git a/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
index dd3c72c53e56..5ad503eabdac 100644
--- a/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
+++ b/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
   <ItemGroup>
-    <TargetingPackExclusions Include="System.Net.Primitives" />
+    <DefaultReferenceExclusions Include="System.Net.Primitives" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CookieInternalTest.cs" />
diff --git a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
index 2eed4c23c82f..ff38fe72ab4b 100644
--- a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
+++ b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
   <ItemGroup>
-    <TargetingPackExclusions Include="System.Configuration" />
+    <DefaultReferenceExclusions Include="System.Configuration" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)\System\Net\Capability.Security.cs">
diff --git a/src/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj b/src/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj
index dacc43cf337f..0329734d849d 100644
--- a/src/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj
+++ b/src/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. -->
-    <TargetingPackExclusions Include="System.Numerics.Tensors" />
+    <DefaultReferenceExclusions Include="System.Numerics.Tensors" />
     <ReferenceFromRuntime Include="System.Numerics.Tensors" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
index 885ea7bb2cbd..aa05700a4723 100644
--- a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
+++ b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
@@ -139,7 +139,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. -->
-    <TargetingPackExclusions Include="System.Reflection.Metadata" />
+    <DefaultReferenceExclusions Include="System.Reflection.Metadata" />
     <ReferenceFromRuntime Include="System.Reflection.Metadata" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/tests.builds b/src/tests.builds
index b2b141ca8673..e41e6130f688 100644
--- a/src/tests.builds
+++ b/src/tests.builds
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <EnableFullCoverageReportTarget>true</EnableFullCoverageReportTarget>
-  </PropertyGroup>
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
@@ -11,10 +7,10 @@
     Since IsTestProject is set to false in this case, when TargetGroup = netfx it will add net462 and net47 build configurations if they exist on the test project.
     We only want to build tests against current TargetGroup -->
     <AdditionalBuildConfigurations Condition="'$(TargetGroup)' == 'netfx'"></AdditionalBuildConfigurations>
-
     <GenerateFullCoverageReport>true</GenerateFullCoverageReport>
     <CoverageReportInputPath>$(TestWorkingDir)**/coverage.xml</CoverageReportInputPath>
     <CoverageReportDir>$(ArtifactsDir)coverage</CoverageReportDir>
+    <EnableFullCoverageReportTarget>true</EnableFullCoverageReportTarget>
     <EnableBenchviewTarget>true</EnableBenchviewTarget>
   </PropertyGroup>