diff --git a/Directory.Build.targets b/Directory.Build.targets
index df4827092b..c0b906ecc4 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -25,8 +25,8 @@
   <!-- Features in .NET 6.x, .NET 7.x, and .NET 8.x only -->
   <PropertyGroup Condition=" $(TargetFramework.StartsWith('net6.')) Or $(TargetFramework.StartsWith('net7.')) Or $(TargetFramework.StartsWith('net8.')) ">
 
-    <DefineConstants>$(DefineConstants);FEATURE_SPANFORMATTABLE</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_RANDOM_NEXTINT64_NEXTSINGLE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_SPANFORMATTABLE</DefineConstants>
 
   </PropertyGroup>
 
diff --git a/TestTargetFramework.props b/TestTargetFramework.props
index 014f84d17f..6bb22df5ea 100644
--- a/TestTargetFramework.props
+++ b/TestTargetFramework.props
@@ -63,9 +63,12 @@
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
-  <PropertyGroup Label="Warnings to be Disabled in Test Projects">
+  <PropertyGroup Label="net5.0 Warnings to be Disabled in Test Projects" Condition=" '$(TargetFramework)' == 'net5.0' ">
     <!-- We purposely test on EoL frameworks for testing netstandard2.1, but we want to keep this warning in production code. -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Warnings to be Disabled in Test Projects">
 
     <NoWarn Label="Nested types should not be visible">$(NoWarn);CA1034</NoWarn>
     <NoWarn Label="Use Literals Where Appropriate">$(NoWarn);CA1802</NoWarn>