diff --git a/eng/Versions.props b/eng/Versions.props
index 0dbd109b1e..3f9a200ff8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -77,7 +77,7 @@
   </PropertyGroup>
   <PropertyGroup Label="VSTest test settings">
     <!-- Name of the elements must be in sync with test\Microsoft.TestPlatform.TestUtilities\IntegrationTestBase.cs -->
-    <FluentAssertionsVersion>6.11.0</FluentAssertionsVersion>
+    <AwesomeAssertionsVersion>8.1.0</AwesomeAssertionsVersion>
     <MoqVersion>4.16.1</MoqVersion>
     <!-- For coverage use our own package on latest stable -->
     <MicrosoftCodeCoverageVersion>17.9.0</MicrosoftCodeCoverageVersion>
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj
index 82eb7326ec..c13550e38a 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj
@@ -30,7 +30,7 @@
     <ProjectReference Include="$(RepoRoot)src\vstest.console\vstest.console.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
+    <PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
     <PackageReference Include="Microsoft.TestPlatform.TestAsset.NativeCPP" Version="2.0.0" />
     <PackageReference Include="Microsoft.TestPlatform.QTools.Assets" Version="2.0.0" />
     <PackageReference Include="Procdump" Version="0.0.1" />
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerformanceTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerformanceTests.cs
index 158dd156c7..d82084b856 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerformanceTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerformanceTests.cs
@@ -30,7 +30,7 @@ public void ExecutionPerformanceTest(string projectName, int expectedTestCount,
 
         var actualExecutionTime = GetExecutionTime();
 
-        actualExecutionTime.Should().BeLessOrEqualTo(thresholdInMs.Milliseconds());
+        actualExecutionTime.Should().BeLessThanOrEqualTo(thresholdInMs.Milliseconds());
     }
 
     [TestMethod]
@@ -45,7 +45,7 @@ public void DiscoveryPerformanceTest()
 
         var actualDiscoveryTime = GetDiscoveryTime();
 
-        actualDiscoveryTime.Should().BeLessOrEqualTo(500.Milliseconds());
+        actualDiscoveryTime.Should().BeLessThanOrEqualTo(500.Milliseconds());
     }
 
     [TestMethod]
@@ -60,7 +60,7 @@ public void VsTestConsolePerformanceTest()
 
         var actualVsTestTime = GetVsTestTime();
 
-        actualVsTestTime.Should().BeLessOrEqualTo(2500.Milliseconds());
+        actualVsTestTime.Should().BeLessThanOrEqualTo(2500.Milliseconds());
     }
 
     [TestMethod]
@@ -75,7 +75,7 @@ public void TestHostPerformanceTest()
 
         var actualTestHostTime = GetTestHostTime();
 
-        actualTestHostTime.Should().BeLessOrEqualTo(2000.Milliseconds());
+        actualTestHostTime.Should().BeLessThanOrEqualTo(2000.Milliseconds());
     }
 
     [TestMethod]
@@ -90,7 +90,7 @@ public void MsTestV2AdapterPerformanceTest()
 
         var actualAdapterTimeTaken = GetAdapterExecutionTime("executor://mstestadapter/v2");
 
-        actualAdapterTimeTaken.Should().BeLessOrEqualTo(1500.Milliseconds());
+        actualAdapterTimeTaken.Should().BeLessThanOrEqualTo(1500.Milliseconds());
     }
 }
 #endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV1Tests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV1Tests.cs
index c8018b859c..5407ab1d94 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV1Tests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV1Tests.cs
@@ -63,7 +63,7 @@ public void TestCaseSerialize()
         sw.Stop();
 
         var actualDuration = sw.Elapsed;
-        actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when serializing 10k test cases");
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test cases");
     }
 
     [TestMethod]
@@ -80,7 +80,7 @@ public void TestCaseDeserialize()
         sw.Stop();
 
         var actualDuration = sw.Elapsed;
-        actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when de-serializing 10k test cases");
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when de-serializing 10k test cases");
     }
 
     [TestMethod]
@@ -96,7 +96,7 @@ public void TestResultSerialize()
         sw.Stop();
 
         var actualDuration = sw.Elapsed;
-        actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when serializing 10k test results");
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test results");
     }
 
     [TestMethod]
@@ -113,7 +113,7 @@ public void TestResultDeserialize()
         sw.Stop();
 
         var actualDuration = sw.Elapsed;
-        actualDuration.Should().BeLessOrEqualTo(3.5.Seconds(), $"when de-serializing 10k test results");
+        actualDuration.Should().BeLessThanOrEqualTo(3.5.Seconds(), $"when de-serializing 10k test results");
     }
 
     private static string SerializeV1<T>(T data)
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV2Tests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV2Tests.cs
index aabda2b83d..9be5bae87f 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV2Tests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV2Tests.cs
@@ -61,7 +61,7 @@ public void TestCaseSerialize2()
         sw.Stop();
 
         var actualDuration = sw.Elapsed;
-        actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when serializing 10k test cases");
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test cases");
     }
 
     [TestMethod]
@@ -78,7 +78,7 @@ public void TestCaseDeserialize2()
         sw.Stop();
 
         var actualDuration = sw.Elapsed;
-        actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when de-serializing 10k test cases");
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when de-serializing 10k test cases");
     }
 
     [TestMethod]
@@ -93,7 +93,7 @@ public void TestResultSerialize2()
         sw.Stop();
 
         var actualDuration = sw.Elapsed;
-        actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when serializing 10k test results");
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test results");
     }
 
     [TestMethod]
@@ -110,7 +110,7 @@ public void TestResultDeserialize2()
         sw.Stop();
 
         var actualDuration = sw.Elapsed;
-        actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when de-serializing 10k test results");
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when de-serializing 10k test results");
     }
 
     private static string SerializeV2<T>(T data)
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs
index dc8f12225b..9b92290274 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs
@@ -73,7 +73,7 @@ public void SocketThroughput2()
         thread.Join();
         dataTransferred.Wait();
 
-        watch.Elapsed.Should().BeLessOrEqualTo(15.Seconds());
+        watch.Elapsed.Should().BeLessThanOrEqualTo(15.Seconds());
     }
 
     [TestMethod]
@@ -104,7 +104,7 @@ public void SocketThroughput1()
         watch.Stop();
         clientThread.Join();
 
-        watch.Elapsed.Should().BeLessOrEqualTo(20.Seconds());
+        watch.Elapsed.Should().BeLessThanOrEqualTo(20.Seconds());
     }
 
     private static void SendData(ICommunicationChannel? channel, Stopwatch watch)
diff --git a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj
index 9d44795e8f..14a64925bc 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj
+++ b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj
@@ -25,7 +25,7 @@
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
+    <PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
     <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
   </ItemGroup>
diff --git a/test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj b/test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj
index f5c5d3c320..fccbad7432 100644
--- a/test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj
+++ b/test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj
@@ -13,7 +13,7 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
+    <PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
diff --git a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj
index 78fd5ffa82..1e4b439bb4 100644
--- a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj
+++ b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj
@@ -22,6 +22,6 @@
     <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
+    <PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
   </ItemGroup>
 </Project>