diff --git a/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs b/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
index 8858887bb50c6f926d153c97bf24d00c953bc668..9ac9f51109859bfd695f20b87939e192d9f13b4f 100644
--- a/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
+++ b/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
@@ -5849,7 +5849,7 @@ public void BinaryFileErrorTest()
             CleanupAllGeneratedFiles(binaryPath);
         }
 
-#if !NETCOREAPP3_1
+#if !NETCOREAPP
         [WorkItem(530221, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530221")]
         [WorkItem(5660, "https://github.com/dotnet/roslyn/issues/5660")]
         [ConditionalFact(typeof(WindowsOnly), typeof(IsEnglishLocal))]
diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs b/src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs
index 35d927f6fee74918e2a5dad44dd46391de4edb46..a2fcaa288ec6ad6a93e235b08a918eb925b49e5a 100644
--- a/src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs
@@ -2270,7 +2270,7 @@ internal void Goo()
             }
         }
 
-#if !NETCOREAPP3_1
+#if !NETCOREAPP
         [ConditionalFact(typeof(WindowsDesktopOnly), Reason = ConditionalSkipReason.TestExecutionNeedsDesktopTypes)]
         [WorkItem(399, "https://github.com/dotnet/roslyn/issues/399")]
         public void Bug399()
diff --git a/src/Compilers/CSharp/Test/WinRT/PEParameterSymbolTests.cs b/src/Compilers/CSharp/Test/WinRT/PEParameterSymbolTests.cs
index d29ee8cba38ad49428bd7f5ff2899fd12f3566a7..3167ad13af21bc4568a6711992062abb2fa74053 100644
--- a/src/Compilers/CSharp/Test/WinRT/PEParameterSymbolTests.cs
+++ b/src/Compilers/CSharp/Test/WinRT/PEParameterSymbolTests.cs
@@ -14,7 +14,7 @@ namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols
 {
     public class PEParameterSymbolTests : CSharpTestBase
     {
-#if !NETCOREAPP3_1
+#if !NETCOREAPP
         [Fact]
         public void NoParameterNames()
         {
diff --git a/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs b/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs
index 4e2d54c570e42e6ad54111cfb9985fe021dd0632..e384f662cbaf69b9103b33454ea343f9d835aec1 100644
--- a/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs
+++ b/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETCOREAPP3_1
+#if NETCOREAPP
 
 using System.Diagnostics;
 using System.Reflection;
diff --git a/src/Compilers/Shared/NamedPipeUtil.cs b/src/Compilers/Shared/NamedPipeUtil.cs
index 9fdc7eecb7707c35d799e73b5f324b9494fad156..4a05ac397564dd763f707f18fb40f006d34ecacb 100644
--- a/src/Compilers/Shared/NamedPipeUtil.cs
+++ b/src/Compilers/Shared/NamedPipeUtil.cs
@@ -166,7 +166,7 @@ internal static bool CheckPipeConnectionOwnership(NamedPipeClientStream pipeStre
             return security;
         }
 
-#elif NETCOREAPP3_1
+#elif NETCOREAPP
 
         private static PipeOptions CurrentUserOption = PipeOptions.CurrentUserOnly;
 
diff --git a/src/Compilers/Shared/RuntimeHostInfo.cs b/src/Compilers/Shared/RuntimeHostInfo.cs
index ce4296e5651ca61aa5b4aab0c2704fe7a321be3b..b7811ed9dd0f63afe4400947cc42526b06c6a350 100644
--- a/src/Compilers/Shared/RuntimeHostInfo.cs
+++ b/src/Compilers/Shared/RuntimeHostInfo.cs
@@ -53,7 +53,7 @@ internal static bool IsDotNetHost([NotNullWhen(true)] out string? pathToDotNet)
         internal static NamedPipeClientStream CreateNamedPipeClient(string serverName, string pipeName, PipeDirection direction, PipeOptions options) =>
             new NamedPipeClientStream(serverName, pipeName, direction, options);
 
-#elif NETCOREAPP3_1
+#elif NETCOREAPP
         internal static bool IsDesktopRuntime => false;
 
         private static string DotNetHostPathEnvironmentName = "DOTNET_HOST_PATH";
diff --git a/src/Compilers/Shared/ShadowCopyAnalyzerAssemblyLoader.cs b/src/Compilers/Shared/ShadowCopyAnalyzerAssemblyLoader.cs
index 0a17ab0f11e3da317f284f55e3f5c795581a82fa..46cb768c955cca223aca016a68ec6391ddb3b78d 100644
--- a/src/Compilers/Shared/ShadowCopyAnalyzerAssemblyLoader.cs
+++ b/src/Compilers/Shared/ShadowCopyAnalyzerAssemblyLoader.cs
@@ -9,8 +9,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-// The ShadowCopyAnalyzerAssemblyLoader derives from DesktopAnalyzerAssemblyLoader (NET472) OR CoreClrAnalyzerAssemblyLoader (NETCOREAPP3_1)
-#if NET472 || NETCOREAPP3_1
+// The ShadowCopyAnalyzerAssemblyLoader derives from DesktopAnalyzerAssemblyLoader (NET472) OR CoreClrAnalyzerAssemblyLoader (NETCOREAPP)
+#if NET472 || NETCOREAPP
 
 namespace Microsoft.CodeAnalysis
 {
diff --git a/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs b/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs
index b030f1958f1fbba71d68ef606d95c52fe6828c7d..2fdcbdb809d1792aea360841b74646cdeeed8f50 100644
--- a/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs
+++ b/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs
@@ -20,7 +20,7 @@ public static partial class RuntimeUtilities
         internal static bool IsDesktopRuntime =>
 #if NET472
             true;
-#elif NETCOREAPP3_1
+#elif NETCOREAPP
             false;
 #elif NETSTANDARD2_0
             throw new PlatformNotSupportedException();
@@ -51,7 +51,7 @@ internal static IRuntimeEnvironmentFactory GetRuntimeEnvironmentFactory()
         {
 #if NET472
             return new Roslyn.Test.Utilities.Desktop.DesktopRuntimeEnvironmentFactory();
-#elif NETCOREAPP3_1
+#elif NETCOREAPP
             return new Roslyn.Test.Utilities.CoreClr.CoreCLRRuntimeEnvironmentFactory();
 #elif NETSTANDARD2_0
             throw new PlatformNotSupportedException();
@@ -64,7 +64,7 @@ internal static AnalyzerAssemblyLoader CreateAnalyzerAssemblyLoader()
         {
 #if NET472
             return new DesktopAnalyzerAssemblyLoader();
-#elif NETCOREAPP3_1
+#elif NETCOREAPP
             return new CoreClrAnalyzerAssemblyLoader();
 #elif NETSTANDARD2_0
             return new ThrowingAnalyzerAssemblyLoader();
diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs
index 5064977865c9b96ab0d2f7d54884900df3553c7d..81059bd30b31dc9ac5345204850c074b0e503609 100644
--- a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs
+++ b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
-#if NETCOREAPP3_1
+#if NETCOREAPP
 using System;
 using System.Linq;
 using System.Collections.Generic;
diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.cs b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.cs
index 697be60593e61ae65ae8a5384de5a5122200fded..53ad88114a6a0184b5c08a73ccf4b355f8763e03 100644
--- a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.cs
+++ b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETCOREAPP3_1
+#if NETCOREAPP
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs b/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs
index bc6af49462db146f95aa5048019df5821714160d..93146b8cedfc5da5e4325a9fe4b93211419ec17b 100644
--- a/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs
+++ b/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs
@@ -1,4 +1,4 @@
-#if NETCOREAPP3_1
+#if NETCOREAPP
 
 using System;
 using System.IO;
diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.cs b/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.cs
index 9d8cdfc111e8ced177abb422b15c1acf4ac3f4de..1efd25958d88a224c1c5199a1bffd3540649e4b4 100644
--- a/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.cs
+++ b/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
-#if NETCOREAPP3_1
+#if NETCOREAPP
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs
index e76919ef73f9ffc0488575518a6a51fd62107a8d..87cfac926770a69954637076d5d7578fd93855cb 100644
--- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs
+++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs
@@ -323,8 +323,6 @@ private bool CheckTargetFrameworks(TextWriter textWriter)
                 {
                     case "net20":
                     case "net472":
-                    case "netcoreapp2.1":
-                    case "netcoreapp3.0":
                     case "netcoreapp3.1":
                     case "$(RoslynPortableTargetFrameworks)":
                         continue;