diff --git a/NuGet.config b/NuGet.config
index 18b373abe1..68a0afe0e4 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <add key="msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
+    <add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
     <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
diff --git a/test/Microsoft.Extensions.ProjectModel.Tests/MsBuild/MsBuildProjectContextBuilderTest.cs b/test/Microsoft.Extensions.ProjectModel.Tests/MsBuild/MsBuildProjectContextBuilderTest.cs
index 4dfeab0d99..debac6638e 100644
--- a/test/Microsoft.Extensions.ProjectModel.Tests/MsBuild/MsBuildProjectContextBuilderTest.cs
+++ b/test/Microsoft.Extensions.ProjectModel.Tests/MsBuild/MsBuildProjectContextBuilderTest.cs
@@ -130,7 +130,7 @@ namespace Microsoft.Extensions.ProjectModel
             Assert.False(_files.GetFileInfo("obj").Exists);
             Assert.Equal(expectedCompileItems, context.CompilationItems.OrderBy(i => i).ToArray());
             Assert.Equal(Path.Combine(_files.Root, "bin", "Debug", "netcoreapp1.0", "test.dll"), context.AssemblyFullPath);
-            Assert.True(context.IsClassLibrary);
+            Assert.True(context.IsClassLibrary, "Expecting IsClassLibrary == true");
             Assert.Equal("TestProject", context.ProjectName);
             Assert.Equal(FrameworkConstants.CommonFrameworks.NetCoreApp10, context.TargetFramework);
             Assert.Equal("Microsoft.TestProject", context.RootNamespace);
diff --git a/test/Microsoft.Extensions.ProjectModel.Tests/MsBuild/MsBuildProjectDependencyProviderTests.cs b/test/Microsoft.Extensions.ProjectModel.Tests/MsBuild/MsBuildProjectDependencyProviderTests.cs
index 7b4eedc203..ce6985ff1b 100644
--- a/test/Microsoft.Extensions.ProjectModel.Tests/MsBuild/MsBuildProjectDependencyProviderTests.cs
+++ b/test/Microsoft.Extensions.ProjectModel.Tests/MsBuild/MsBuildProjectDependencyProviderTests.cs
@@ -3,17 +3,19 @@
 
 using System;
 using System.Linq;
-using Microsoft.Extensions.ProjectModel.Tests;
-using Xunit;
-using Xunit.Abstractions;
 using System.IO;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.Extensions.ProjectModel.Tests;
 using NuGet.Frameworks;
+using Xunit;
+using Xunit.Abstractions;
 
 namespace Microsoft.Extensions.ProjectModel.MsBuild
 {
-    public class MsBuildProjectDependencyProviderTests: IClassFixture<MsBuildFixture>
+    public class MsBuildProjectDependencyProviderTests : IClassFixture<MsBuildFixture>
     {
+        private const string SkipReason = "CI doesn't yet have a new enough version of .NET Core SDK";
+
         private const string NugetConfigTxt = @"
 <configuration>
     <packageSources>
@@ -98,7 +100,7 @@ namespace Microsoft.Extensions.ProjectModel.MsBuild
             _output = output;
         }
 
-        [Fact(Skip = "CI doesn't yet have a new enough version of .NET Core SDK")]
+        [Fact(Skip = SkipReason)]
         public void BuildDependenciesForProject()
         {
             using (var fileProvider = new TemporaryFileProvider())
@@ -122,7 +124,7 @@ namespace Microsoft.Extensions.ProjectModel.MsBuild
 
                 var muxer = Path.Combine(testContext.ExtensionsPath, "../..", "dotnet.exe");
                 var result = Command
-                    .Create(muxer, new[] { "restore3", Path.Combine(fileProvider.Root, "Library1","Library1.csproj") })
+                    .Create(muxer, new[] { "restore3", Path.Combine(fileProvider.Root, "Library1", "Library1.csproj") })
                     .OnErrorLine(l => _output.WriteLine(l))
                     .OnOutputLine(l => _output.WriteLine(l))
                     .Execute();
@@ -146,26 +148,16 @@ namespace Microsoft.Extensions.ProjectModel.MsBuild
 
                 var context = builder.Build();
 
-                var compilationAssemblies = context.CompilationAssemblies;
-                var lib1Dll = compilationAssemblies
-                    .Where(assembly => assembly.Name.Equals("Library1", StringComparison.OrdinalIgnoreCase))
-                    .FirstOrDefault();
-
-                Assert.NotNull(lib1Dll);
-                Assert.True(File.Exists(lib1Dll.ResolvedPath));
+                var lib1Dll = Assert.Single(context.CompilationAssemblies, a => a.Name.Equals("Library1", StringComparison.OrdinalIgnoreCase));
+                Assert.False(File.Exists(lib1Dll.ResolvedPath), $"Design time build. Shouldn't produce a file to {lib1Dll.ResolvedPath}");
 
                 // This reference doesn't resolve so should not be available here.
-                Assert.False(compilationAssemblies.Any(assembly => assembly.Name.Equals("xyz", StringComparison.OrdinalIgnoreCase)));
+                Assert.DoesNotContain("xyz", context.CompilationAssemblies.Select(a => a.Name), StringComparer.OrdinalIgnoreCase);
 
                 var packageDependencies = context.PackageDependencies;
-                var mvcPackage = packageDependencies
-                    .Where(p => p.Name.Equals("Microsoft.AspNetCore.Mvc", StringComparison.OrdinalIgnoreCase))
-                    .FirstOrDefault();
-                Assert.NotNull(mvcPackage);
-
-                Assert.True(mvcPackage.Dependencies.Any(dependency => dependency.Name.Equals("Microsoft.Extensions.DependencyInjection", StringComparison.OrdinalIgnoreCase)));
-
-                Assert.True(context.ProjectReferences.First().Equals(Path.Combine(fileProvider.Root, "Library1", "Library1.csproj")));
+                var mvcPackage = Assert.Single(context.PackageDependencies, p => p.Name.Equals("Microsoft.AspNetCore.Mvc", StringComparison.OrdinalIgnoreCase));
+                Assert.Contains("Microsoft.Extensions.DependencyInjection", mvcPackage.Dependencies.Select(d => d.Name), StringComparer.OrdinalIgnoreCase);
+                Assert.Equal(Path.Combine(fileProvider.Root, "Root", "..", "Library1", "Library1.csproj"), context.ProjectReferences.First());
             }
         }
     }
diff --git a/test/Microsoft.Extensions.ProjectModel.Tests/project.json b/test/Microsoft.Extensions.ProjectModel.Tests/project.json
index 09eaf72e6f..dbb538c472 100644
--- a/test/Microsoft.Extensions.ProjectModel.Tests/project.json
+++ b/test/Microsoft.Extensions.ProjectModel.Tests/project.json
@@ -7,10 +7,11 @@
     }
   },
   "dependencies": {
-    "NuGet.Frameworks": "3.5.0-rc1-final",
+    "NuGet.ProjectModel": "3.6.0-*",
+    "NuGet.Frameworks": "3.6.0-*",
     "Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-003121",
     "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-003121",
-    "Microsoft.Build.Runtime": "15.1.298-preview5",
+    "Microsoft.Build.Runtime": "15.1.319-preview5",
     "Microsoft.Extensions.FileProviders.Physical": "1.1.0-*",
     "Microsoft.Extensions.ProjectModel.Abstractions.Sources": {
         "type": "build",