diff --git a/NuGet.config b/NuGet.config
index 90ce61307f..5144de9b69 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,7 +2,9 @@
 <configuration>
   <packageSources>
     <clear />
+    <add key="dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
+    <add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
     <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
-</configuration>
+</configuration>
\ No newline at end of file
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs
index ff124a8703..c7fc330aef 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs
@@ -97,10 +97,10 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
             args.Add("exec");
 
             args.Add("--depsfile");
-            args.Add(Path.Combine(AppContext.BaseDirectory, thisAssembly + ".deps.json"));
+            args.Add(Path.Combine(AppContext.BaseDirectory, thisAssembly + FileNameSuffixes.DepsJson));
 
             args.Add("--runtimeconfig");
-            args.Add(Path.Combine(AppContext.BaseDirectory, thisAssembly + ".runtimeconfig.json"));
+            args.Add(Path.Combine(AppContext.BaseDirectory, thisAssembly + FileNameSuffixes.RuntimeConfigJson));
 
             args.Add(Path.Combine(AppContext.BaseDirectory, "dotnet-watch.dll"));