diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index c21c79e..6780c6a 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-final" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.0-rc1-final" PrivateAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0-rc1-final" PrivateAssets="All" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0-preview1-final" />  </ItemGroup>
   <ItemGroup>
     <Folder Include="Views\Catalog\" />
     <Folder Include="wwwroot\fonts\" />
diff --git a/src/WebRazorPages/WebRazorPages.csproj b/src/WebRazorPages/WebRazorPages.csproj
index 212f4ed..71cc33b 100644
--- a/src/WebRazorPages/WebRazorPages.csproj
+++ b/src/WebRazorPages/WebRazorPages.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0-preview1-final" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationCore\ApplicationCore.csproj" />
diff --git a/tests/FunctionalTests/Web/Controllers/BaseWebTest.cs b/tests/FunctionalTests/Web/Controllers/BaseWebTest.cs
index 8f96a07..f1c1d9f 100644
--- a/tests/FunctionalTests/Web/Controllers/BaseWebTest.cs
+++ b/tests/FunctionalTests/Web/Controllers/BaseWebTest.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Net.Http;
 using System.Reflection;
-using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.eShopWeb;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
@@ -66,7 +65,7 @@ namespace FunctionalTests.Web.Controllers
             var projectName = startupAssembly.GetName().Name;
 
             // Get currently executing test project path
-            var applicationBasePath = PlatformServices.Default.Application.ApplicationBasePath;
+            var applicationBasePath = AppContext.BaseDirectory;
 
             // Find the folder which contains the solution file. We then use this information to find the target
             // project which we want to test.