diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets
index 0c206deb1e52..fe02a6d3d962 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets
@@ -22,8 +22,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <_NoneAnalysisLevel>4.0</_NoneAnalysisLevel>
     <!-- When the base TFM of the platform bumps, these must be bumped as well. Preview should always be the 'next' TFM. -->
-    <_LatestAnalysisLevel>10.0</_LatestAnalysisLevel>
-    <_PreviewAnalysisLevel>11.0</_PreviewAnalysisLevel>
+    <_LatestAnalysisLevel>11.0</_LatestAnalysisLevel>
+    <_PreviewAnalysisLevel>12.0</_PreviewAnalysisLevel>
 
     <AnalysisLevel Condition="'$(AnalysisLevel)' == '' And
                               '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs
index ec984b86c492..342a4f254de8 100644
--- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs
+++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs
@@ -159,6 +159,9 @@ static void Main()
         }
 
         [InlineData(ToolsetInfo.CurrentTargetFramework)]
+        // Fixing this test requires bumping _LatestAnalysisLevel and _PreviewAnalysisLevel
+        // Bumping will cause It_maps_analysis_properties_to_globalconfig to fail which requires changes in dotnet/roslyn-analyzers repo.
+        // See instructions in the comment in It_maps_analysis_properties_to_globalconfig
         [RequiresMSBuildVersionTheory("16.8")]
         public void It_defaults_preview_AnalysisLevel_to_the_next_tfm(string currentTFM)
         {
@@ -370,6 +373,10 @@ static void Main()
         [InlineData("10.0", "", "true", "")]
         [InlineData("10", "default", "false", "Security")]
         [InlineData("10.0", "", "true", "Usage")]
+        [InlineData("11", "default", "false", "")]
+        [InlineData("11.0", "", "true", "")]
+        [InlineData("11", "default", "false", "Security")]
+        [InlineData("11.0", "", "true", "Usage")]
         [RequiresMSBuildVersionTheory("16.8")]
         public void It_maps_analysis_properties_to_globalconfig(string analysisLevel, string analysisMode, string codeAnalysisTreatWarningsAsErrors, string category)
         {