diff --git a/Microsoft.Rest/ClientRuntime.Etw/ClientRuntime.Etw.csproj b/Microsoft.Rest/ClientRuntime.Etw/ClientRuntime.Etw.csproj
index 08b7c10f2b..a4ecf72673 100644
--- a/Microsoft.Rest/ClientRuntime.Etw/ClientRuntime.Etw.csproj
+++ b/Microsoft.Rest/ClientRuntime.Etw/ClientRuntime.Etw.csproj
@@ -15,24 +15,6 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NuGetPackageImportStamp>644881db</NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Net45-Debug'">
-    <DocumentationFile>bin\Net45-Debug\Microsoft.Rest.ClientRuntime.Etw.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Net45-Release'">
-    <DocumentationFile>bin\Net45-Release\Microsoft.Rest.ClientRuntime.Etw.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Net40-Debug'">
-    <DocumentationFile>bin\Net40-Debug\Microsoft.Rest.ClientRuntime.Etw.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Net40-Release'">
-    <DocumentationFile>bin\Net40-Release\Microsoft.Rest.ClientRuntime.Etw.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Portable-Debug'">
-    <DocumentationFile>bin\Portable-Debug\Microsoft.Rest.ClientRuntime.Etw.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Portable-Release'">
-    <DocumentationFile>bin\Portable-Release\Microsoft.Rest.ClientRuntime.Etw.xml</DocumentationFile>
-  </PropertyGroup>
   <Import Project="$(SolutionDir)\tools\AutoRest.Settings.targets" />
   <ItemGroup>
     <Compile Include="GlobalSuppressions.cs" />
diff --git a/Microsoft.Rest/ClientRuntime.Tests/packages.config b/Microsoft.Rest/ClientRuntime.Tests/packages.config
index 166b91860c..b741fb2354 100644
--- a/Microsoft.Rest/ClientRuntime.Tests/packages.config
+++ b/Microsoft.Rest/ClientRuntime.Tests/packages.config
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
-  <package id="xunit" version="1.9.2" targetFramework="net45" />
-  <package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="0.99.9-build1021" targetFramework="net45" />
+  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="portable-net403+win+wpa81" />
+  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="portable-net403+win+wpa81" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable-net403+win+wpa81" />
+  <package id="Microsoft.Net.Http" version="2.2.22" targetFramework="portable-net403+win+wpa81" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="portable-net403+win+wpa81" />
+  <package id="xunit" version="1.9.2" targetFramework="portable-net403+win+wpa81" />
+  <package id="xunit.extensions" version="1.9.2" targetFramework="portable-net403+win+wpa81" />
+  <package id="xunit.runner.visualstudio" version="0.99.9-build1021" targetFramework="portable-net403+win+wpa81" />
 </packages>
\ No newline at end of file
diff --git a/Microsoft.Rest/ClientRuntime/ClientRuntime.csproj b/Microsoft.Rest/ClientRuntime/ClientRuntime.csproj
index 17db11bd1e..8d0a214faf 100644
--- a/Microsoft.Rest/ClientRuntime/ClientRuntime.csproj
+++ b/Microsoft.Rest/ClientRuntime/ClientRuntime.csproj
@@ -15,28 +15,6 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NuGetPackageImportStamp>d6eb8bcd</NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\Microsoft.Rest.ClientRuntime.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net45-Debug|AnyCPU'">
-    <DocumentationFile>bin\Net45-Debug\Microsoft.Rest.ClientRuntime.xml</DocumentationFile>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net45-Release|AnyCPU'">
-    <DocumentationFile>bin\Net45-Release\Microsoft.Rest.ClientRuntime.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net40-Debug|AnyCPU'">
-    <DocumentationFile>bin\Net40-Debug\Microsoft.Rest.ClientRuntime.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net40-Release|AnyCPU'">
-    <DocumentationFile>bin\Net40-Release\Microsoft.Rest.ClientRuntime.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Portable-Debug|AnyCPU'">
-    <DocumentationFile>bin\Portable-Debug\Microsoft.Rest.ClientRuntime.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Portable-Release|AnyCPU'">
-    <DocumentationFile>bin\Portable-Release\Microsoft.Rest.ClientRuntime.xml</DocumentationFile>
-  </PropertyGroup>
   <Import Project="$(SolutionDir)\tools\AutoRest.Settings.targets" />
   <ItemGroup>
     <Compile Include="BasicAuthenticationCredentials.cs" />
diff --git a/build.proj b/build.proj
index 3c18ac6505..4da1c4264a 100644
--- a/build.proj
+++ b/build.proj
@@ -116,8 +116,7 @@
   <UsingTask TaskName="Xunit.Runner.msbuild.xunit" AssemblyFile="packages\xunit.1.9.2\lib\net20\xunit.runner.msbuild.dll" />
   <Target Name="Test">
     <ItemGroup>
-      <!-- Only running test projects compiled for net45. -->
-      <TestDlls Include=".\**\*.Tests\bin\net45*\*Tests.dll"/>
+      <TestDlls Include=".\**\*.Tests\bin\*\*Tests.dll"/>
     </ItemGroup>
     <MakeDir Directories="$(LibraryRoot)TestResults"/>
     <Message Text="%(TestDlls.Filename)" />