diff --git a/build/Packages.props b/build/Packages.props
index 0d41fcd38e..235117349e 100644
--- a/build/Packages.props
+++ b/build/Packages.props
@@ -4,7 +4,7 @@
     <PropertyGroup>
         <MicrosoftExtensionPackageVersion>7.0.0</MicrosoftExtensionPackageVersion>
         <MicrosoftTestPackageVersion>17.6.0</MicrosoftTestPackageVersion>
-        <MSBuildPackageVersion>17.6.3</MSBuildPackageVersion>
+        <MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
         <NuGetPackageVersion>6.7.0-preview.1.20</NuGetPackageVersion>
         <RoslynPackageVersion>4.7.0-2.23225.15</RoslynPackageVersion>
         <XunitPackageVersion>2.4.1</XunitPackageVersion>
diff --git a/tests/OmniSharp.DotNetTest.Tests/GetTestStartInfoFacts.cs b/tests/OmniSharp.DotNetTest.Tests/GetTestStartInfoFacts.cs
index b00e277be9..5843a187aa 100644
--- a/tests/OmniSharp.DotNetTest.Tests/GetTestStartInfoFacts.cs
+++ b/tests/OmniSharp.DotNetTest.Tests/GetTestStartInfoFacts.cs
@@ -23,7 +23,7 @@ await GetDotNetTestStartInfoAsync(
                 XunitTestProject,
                 methodName: "Main.Test.MainTest.Test",
                 testFramework: "xunit",
-                targetFrameworkVersion: ".NETCoreApp,Version=v3.1",
+                targetFrameworkVersion: ".NETCoreApp,Version=v6.0",
                 assert: AssertCorrectness);
         }
 
@@ -34,7 +34,7 @@ await GetDotNetTestStartInfoAsync(
                 NUnitTestProject,
                 methodName: "Main.Test.MainTest.Test",
                 testFramework: "nunit",
-                targetFrameworkVersion: ".NETCoreApp,Version=v3.1",
+                targetFrameworkVersion: ".NETCoreApp,Version=v6.0",
                 assert: AssertCorrectness);
         }
 
@@ -45,7 +45,7 @@ await GetDotNetTestStartInfoAsync(
                 MSTestProject,
                 methodName: "Main.Test.MainTest.Test",
                 testFramework: "mstest",
-                targetFrameworkVersion: ".NETCoreApp,Version=v3.1",
+                targetFrameworkVersion: ".NETCoreApp,Version=v6.0",
                 assert: AssertCorrectness);
         }
 
diff --git a/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs b/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs
index 359bd7ac49..92f481c590 100644
--- a/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs
+++ b/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs
@@ -65,7 +65,7 @@ await RunDotNetTestAsync(
                 methodName: "Main.Test.MainTest.Test",
                 testFramework: "xunit",
                 shouldPass: true,
-                targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
+                targetFrameworkVersion: ".NETCoreApp,Version=v6.0");
         }
 
         [Fact]
@@ -76,7 +76,7 @@ await RunDotNetTestAsync(
                 methodName: "Main.Test.MainTest.DataDrivenTest1",
                 testFramework: "xunit",
                 shouldPass: false,
-                targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
+                targetFrameworkVersion: ".NETCoreApp,Version=v6.0");
         }
 
         [Fact]
@@ -87,7 +87,7 @@ await RunDotNetTestAsync(
                 methodName: "Main.Test.MainTest.DataDrivenTest2",
                 testFramework: "xunit",
                 shouldPass: true,
-                targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
+                targetFrameworkVersion: ".NETCoreApp,Version=v6.0");
         }
 
         [Fact]
@@ -98,7 +98,7 @@ await RunDotNetTestAsync(
                 methodName: "Main.Test.MainTest.UsesDisplayName",
                 testFramework: "xunit",
                 shouldPass: true,
-                targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
+                targetFrameworkVersion: ".NETCoreApp,Version=v6.0");
         }
 
         [Fact]
@@ -109,7 +109,7 @@ public async Task RunXunitTestWithSimilarName()
                 methodName: "Main.Test.MainTest.TestWithSimilarName",
                 testFramework: "xunit",
                 shouldPass: true,
-                targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
+                targetFrameworkVersion: ".NETCoreApp,Version=v6.0");
 
             Assert.Single(response.Results);
         }
@@ -122,7 +122,7 @@ public async Task RunXunitFailingTest()
                 methodName: "Main.Test.MainTest.FailingTest",
                 testFramework: "xunit",
                 shouldPass: false,
-                targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
+                targetFrameworkVersion: ".NETCoreApp,Version=v6.0");
 
             Assert.Single(response.Results);
             Assert.NotEmpty(response.Results[0].ErrorMessage);
@@ -137,7 +137,7 @@ public async Task RunXunitStandardOutputIsReturned()
                 methodName: "Main.Test.MainTest.CheckStandardOutput",
                 testFramework: "xunit",
                 shouldPass: true,
-                targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
+                targetFrameworkVersion: ".NETCoreApp,Version=v6.0");
 
             Assert.Single(response.Results);
             Assert.NotEmpty(response.Results[0].StandardOutput);
diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectFileInfoTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectFileInfoTests.cs
index be2e656541..d9f2fd67d9 100644
--- a/tests/OmniSharp.MSBuild.Tests/ProjectFileInfoTests.cs
+++ b/tests/OmniSharp.MSBuild.Tests/ProjectFileInfoTests.cs
@@ -239,8 +239,7 @@ public async Task ProjectReferenceProducingAnalyzerItems()
                 var projectFilePath = Path.Combine(testProject.Directory, "ConsumingProject", "ConsumingProject.csproj");
                 var projectFileInfo = CreateProjectFileInfo(_sharedOmniSharpHostFixture.OmniSharpTestHost, testProject, projectFilePath);
                 Assert.Empty(projectFileInfo.ProjectReferences);
-                var analyzerFileReference = Assert.Single(projectFileInfo.Analyzers);
-                Assert.EndsWith("Analyzer.dll", analyzerFileReference);
+                Assert.Single(projectFileInfo.Analyzers.Where(path => Path.GetFileName(path) == "Analyzer.dll"));
             }
         }
     }
diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
index 2feea8e9c4..dd91b4dd93 100644
--- a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
+++ b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
@@ -150,7 +150,7 @@ public async Task If_there_are_multiple_target_frameworks_they_are_emitted()
             Assert.Single(emitter.ReceivedMessages);
             var tfm = emitter.ReceivedMessages[0].TargetFrameworks.ToArray();
             Assert.Equal(2, tfm.Count());
-            Assert.Equal("netstandard2.0", tfm[0]);
+            Assert.Equal("netstandard1.5", tfm[0]);
             Assert.Equal("netstandard2.0", tfm[1]);
         }
 
diff --git a/tests/OmniSharp.MSBuild.Tests/WorkspaceInformationTests.cs b/tests/OmniSharp.MSBuild.Tests/WorkspaceInformationTests.cs
index 0ec14da797..d6a9b8d879 100644
--- a/tests/OmniSharp.MSBuild.Tests/WorkspaceInformationTests.cs
+++ b/tests/OmniSharp.MSBuild.Tests/WorkspaceInformationTests.cs
@@ -39,7 +39,7 @@ public async Task TestProjectAndSolution()
             Assert.True(project.IsExe);
             Assert.False(project.IsUnityProject);
 
-            Assert.Equal(".NETCoreApp,Version=v3.1", project.TargetFramework);
+            Assert.Equal(".NETCoreApp,Version=v6.0", project.TargetFramework);
             var targetFramework = Assert.Single(project.TargetFrameworks);
             Assert.Equal("net6.0", targetFramework.ShortName);
         }
@@ -66,7 +66,7 @@ public async Task TestProjectAndSolutionFilter()
                 Assert.True(project.IsExe);
                 Assert.False(project.IsUnityProject);
 
-                Assert.Equal(".NETCoreApp,Version=v3.1", project.TargetFramework);
+                Assert.Equal(".NETCoreApp,Version=v6.0", project.TargetFramework);
                 var targetFramework = Assert.Single(project.TargetFrameworks);
                 Assert.Equal("net6.0", targetFramework.ShortName);
             }
@@ -82,7 +82,7 @@ public async Task ProjectAndSolutionWithProjectSection()
             Assert.Equal("ProjectAndSolutionWithProjectSection.sln", Path.GetFileName(workspaceInfo.SolutionPath));
             Assert.NotNull(workspaceInfo.Projects);
             var project = Assert.Single(workspaceInfo.Projects);
-            Assert.Equal(".NETCoreApp,Version=v3.1", project.TargetFramework);
+            Assert.Equal(".NETCoreApp,Version=v6.0", project.TargetFramework);
             Assert.Equal("net6.0", project.TargetFrameworks[0].ShortName);
         }
 
@@ -127,12 +127,12 @@ public async Task TwoProjectsWithSolution()
 
             var firstProject = workspaceInfo.Projects[0];
             Assert.Equal("App.csproj", Path.GetFileName(firstProject.Path));
-            Assert.Equal(".NETCoreApp,Version=v3.1", firstProject.TargetFramework);
+            Assert.Equal(".NETCoreApp,Version=v6.0", firstProject.TargetFramework);
             Assert.Equal("net6.0", firstProject.TargetFrameworks[0].ShortName);
 
             var secondProject = workspaceInfo.Projects[1];
             Assert.Equal("Lib.csproj", Path.GetFileName(secondProject.Path));
-            Assert.Equal(".NETStandard,Version=v1.3", secondProject.TargetFramework);
+            Assert.Equal(".NETStandard,Version=v2.0", secondProject.TargetFramework);
             Assert.Equal("netstandard2.0", secondProject.TargetFrameworks[0].ShortName);
         }
 
@@ -150,12 +150,12 @@ public async Task TwoProjectsWithSolutionAndCustomConfigurations()
 
             var firstProject = workspaceInfo.Projects[0];
             Assert.Equal("App.csproj", Path.GetFileName(firstProject.Path));
-            Assert.Equal(".NETCoreApp,Version=v3.1", firstProject.TargetFramework);
+            Assert.Equal(".NETCoreApp,Version=v6.0", firstProject.TargetFramework);
             Assert.Equal("net6.0", firstProject.TargetFrameworks[0].ShortName);
 
             var secondProject = workspaceInfo.Projects[1];
             Assert.Equal("Lib.csproj", Path.GetFileName(secondProject.Path));
-            Assert.Equal(".NETStandard,Version=v1.3", secondProject.TargetFramework);
+            Assert.Equal(".NETStandard,Version=v1.5", secondProject.TargetFramework);
             Assert.Equal("netstandard2.0", secondProject.TargetFrameworks[0].ShortName);
         }
 
@@ -268,7 +268,7 @@ public async Task TestProjectWithMultiTFMReferencedProjectOutsideOfOmniSharp()
 
             var project2 = workspaceInfo.Projects[1];
             Assert.Equal("Lib.csproj", Path.GetFileName(project2.Path));
-            Assert.Equal(".NETStandard,Version=v1.3", project2.TargetFramework);
+            Assert.Equal(".NETStandard,Version=v1.5", project2.TargetFramework);
             Assert.Equal(2, project2.TargetFrameworks.Count);
         }