diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/DotNetWatchScenario.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/DotNetWatchScenario.cs
index 89cb67ef35..5b6799fab4 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/DotNetWatchScenario.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/DotNetWatchScenario.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using Microsoft.AspNetCore.Testing.Functional;
 using Microsoft.Extensions.Internal;
 
 namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs
deleted file mode 100644
index a5abaab1fd..0000000000
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Xml.Linq;
-using Newtonsoft.Json.Linq;
-
-namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
-{
-    public class ProjectToolScenario: IDisposable
-    {
-        private const string NugetConfigFileName = "NuGet.config";
-
-        private static readonly object _restoreLock = new object();
-
-        public ProjectToolScenario()
-        {
-            Console.WriteLine($"The temporary test folder is {TempFolder}");
-
-            WorkFolder = Path.Combine(TempFolder, "work");
-
-            CreateTestDirectory();
-        }
-
-        public string TempFolder { get; } = Path.Combine(Path.GetDirectoryName(FindNugetConfig()), "testWorkDir" , Guid.NewGuid().ToString());
-
-        public string WorkFolder { get; }
-
-        public void AddProject(string projectFolder)
-        {
-            var destinationFolder = Path.Combine(WorkFolder, Path.GetFileName(projectFolder));
-            Console.WriteLine($"Copying project {projectFolder} to {destinationFolder}");
-
-            Directory.CreateDirectory(destinationFolder);
-
-            foreach (var directory in Directory.GetDirectories(projectFolder, "*", SearchOption.AllDirectories))
-            {
-                Directory.CreateDirectory(directory.Replace(projectFolder, destinationFolder));
-            }
-
-            foreach (var file in Directory.GetFiles(projectFolder, "*.*", SearchOption.AllDirectories))
-            {
-                File.Copy(file, file.Replace(projectFolder, destinationFolder), true);
-            }
-        }
-
-        public void AddNugetFeed(string feedName, string feed)
-        {
-            var tempNugetConfigFile = Path.Combine(WorkFolder, NugetConfigFileName);
-
-            var nugetConfig = XDocument.Load(tempNugetConfigFile);
-            var packageSource = nugetConfig.Element("configuration").Element("packageSources");
-            packageSource.Add(new XElement("add", new XAttribute("key", feedName), new XAttribute("value", feed)));
-            using (var stream = File.OpenWrite(tempNugetConfigFile))
-            {
-                nugetConfig.Save(stream);
-            }
-        }
-
-        public void AddToolToProject(string projectName, string toolName)
-        {
-            var projectFile = Path.Combine(WorkFolder, projectName, "project.json");
-            Console.WriteLine($"Adding {toolName} to {projectFile}");
-
-            var versionSuffix = Environment.GetEnvironmentVariable("DOTNET_BUILD_VERSION");
-            if (string.IsNullOrEmpty(versionSuffix))
-            {
-               versionSuffix = "*";
-            }
-
-            var projectJson = JObject.Parse(File.ReadAllText(projectFile));
-            projectJson.Add("tools",
-              new JObject(
-                new JProperty(toolName,
-                  new JObject(
-                    new JProperty("version", "1.0.0-" + versionSuffix),
-                    new JProperty("imports", "portable-net451+win8")))));
-
-            File.WriteAllText(projectFile, projectJson.ToString());
-        }
-
-        public void Restore(string project = null)
-        {
-            if (project == null)
-            {
-                project = WorkFolder;
-            }
-            else
-            {
-                project = Path.Combine(WorkFolder, project);
-            }
-
-            // Tests are run in parallel and they try to restore tools concurrently.
-            // This causes issues because the deps json file for a tool is being written from
-            // multiple threads - which results in either sharing violation or corrupted json.
-            lock(_restoreLock)
-            {
-                var restore = ExecuteDotnet($"restore -v Minimal", project);
-                restore.WaitForExit();
-
-                if (restore.ExitCode != 0)
-                {
-                    throw new Exception($"Exit code {restore.ExitCode}");
-                }
-            }
-        }
-
-        private void CreateTestDirectory()
-        {
-            Directory.CreateDirectory(WorkFolder);
-            File.WriteAllText(Path.Combine(WorkFolder, "global.json"), "{}");
-
-            var nugetConfigFilePath = FindNugetConfig();
-
-            var tempNugetConfigFile = Path.Combine(WorkFolder, NugetConfigFileName);
-            File.Copy(nugetConfigFilePath, tempNugetConfigFile);
-        }
-
-        public Process ExecuteDotnet(string arguments, string workDir, IDictionary<string, string> environmentVariables = null)
-        {
-            Console.WriteLine($"Running dotnet {arguments} in {workDir}");
-
-            var psi = new ProcessStartInfo("dotnet", arguments)
-            {
-                UseShellExecute = false,
-                WorkingDirectory = workDir,
-            };
-
-            if (environmentVariables != null)
-            {
-                foreach (var newEnvVar in environmentVariables)
-                {
-                    if (psi.Environment.ContainsKey(newEnvVar.Key))
-                    {
-                        psi.Environment[newEnvVar.Key] = newEnvVar.Value;
-                    }
-                    else
-                    {
-                        psi.Environment.Add(newEnvVar.Key, newEnvVar.Value);
-                    }
-                }
-            }
-
-            return Process.Start(psi);
-        }
-
-        private static string FindNugetConfig()
-        {
-            var currentDirPath = Directory.GetCurrentDirectory();
-
-            string nugetConfigFile;
-            while (true)
-            {
-                nugetConfigFile = Directory.GetFiles(currentDirPath).SingleOrDefault(f => Path.GetFileName(f).Equals(NugetConfigFileName, StringComparison.Ordinal));
-                if (!string.IsNullOrEmpty(nugetConfigFile))
-                {
-                    break;
-                }
-
-                currentDirPath = Path.GetDirectoryName(currentDirPath);
-            }
-
-            return nugetConfigFile;
-        }
-
-        public void Dispose()
-        {
-            try
-            {
-                Directory.Delete(TempFolder, recursive: true);
-            }
-            catch
-            {
-                Console.WriteLine($"Failed to delete {TempFolder}. Retrying...");
-                Thread.Sleep(TimeSpan.FromSeconds(5));
-                Directory.Delete(TempFolder, recursive: true);
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json
index e7671bd373..0881b8ae53 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json
@@ -5,6 +5,7 @@
   },
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
+    "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
     "Microsoft.Extensions.Process.Sources": {
       "type": "build",