diff --git a/tests/MSBuild/MSBuildWorkspaceLoaderTests.cs b/tests/MSBuild/MSBuildWorkspaceLoaderTests.cs
index 7597b658ba..eb3d2c3391 100644
--- a/tests/MSBuild/MSBuildWorkspaceLoaderTests.cs
+++ b/tests/MSBuild/MSBuildWorkspaceLoaderTests.cs
@@ -35,9 +35,9 @@ public MSBuildWorkspaceLoaderTests(ITestOutputHelper output)
         // [InlineData("wpfusercontrollib")]
         // [InlineData("wpflib")]
         // [InlineData("wpfcustomcontrollib")]
-        public async Task CSharpTemplateProject_WindowsOnly_LoadWithNoDiagnostics(string templateName)
+        public async Task CSharpTemplateProject_WindowsOnly_LoadWithNoDiagnostics(string templateName, string ignoredDiagnostics = "")
         {
-            await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.CSharp);
+            await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.CSharp, ignoredDiagnostics.Split(";", StringSplitOptions.TrimEntries));
         }
 
         [MSBuildTheory]
@@ -45,7 +45,7 @@ public async Task CSharpTemplateProject_WindowsOnly_LoadWithNoDiagnostics(string
         [InlineData("grpc")]
         [InlineData("webapi")]
         [InlineData("razor")]
-        [InlineData("mvc")]
+        [InlineData("mvc", "CS8602")]
         [InlineData("angular")]
         [InlineData("react")]
         // Skip="https://github.com/dotnet/format/issues/1402"
@@ -59,20 +59,20 @@ public async Task CSharpTemplateProject_WindowsOnly_LoadWithNoDiagnostics(string
         [InlineData("razorclasslib")]
         [InlineData("worker")]
         [InlineData("xunit")]
-        public async Task CSharpTemplateProject_LoadWithNoDiagnostics(string templateName)
+        public async Task CSharpTemplateProject_LoadWithNoDiagnostics(string templateName, string ignoredDiagnostics = "")
         {
-            await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.CSharp);
+            await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.CSharp, ignoredDiagnostics.Split(";", StringSplitOptions.TrimEntries));
         }
 
         [MSBuildTheory]
-        [InlineData("classlib")]
-        [InlineData("console")]
-        [InlineData("mstest")]
-        [InlineData("nunit")]
-        [InlineData("xunit")]
-        public async Task VisualBasicTemplateProject_LoadWithNoDiagnostics(string templateName)
+        [InlineData("classlib", "BC30002")]
+        [InlineData("console", "BC30002")]
+        [InlineData("mstest", "BC30002")]
+        [InlineData("nunit", "BC30002")]
+        [InlineData("xunit", "BC30002")]
+        public async Task VisualBasicTemplateProject_LoadWithNoDiagnostics(string templateName, string ignoredDiagnostics)
         {
-            await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.VisualBasic, ignoredDiagnostics: new[] { "BC30002" });
+            await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.VisualBasic, ignoredDiagnostics.Split(";", StringSplitOptions.TrimEntries));
         }
 
         private async Task AssertTemplateProjectLoadsCleanlyAsync(string templateName, string languageName, string[] ignoredDiagnostics = null)