diff --git a/tests/Tests.Common/Tests.Common.csproj b/tests/Tests.Common/Tests.Common.csproj
index cb65cab3..a8b17073 100644
--- a/tests/Tests.Common/Tests.Common.csproj
+++ b/tests/Tests.Common/Tests.Common.csproj
@@ -10,14 +10,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/Videra.Avalonia.Tests/Videra.Avalonia.Tests.csproj b/tests/Videra.Avalonia.Tests/Videra.Avalonia.Tests.csproj
index 36765eb6..bbab4496 100644
--- a/tests/Videra.Avalonia.Tests/Videra.Avalonia.Tests.csproj
+++ b/tests/Videra.Avalonia.Tests/Videra.Avalonia.Tests.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
diff --git a/tests/Videra.Core.IntegrationTests/Videra.Core.IntegrationTests.csproj b/tests/Videra.Core.IntegrationTests/Videra.Core.IntegrationTests.csproj
index 4ad7fa49..140909b5 100644
--- a/tests/Videra.Core.IntegrationTests/Videra.Core.IntegrationTests.csproj
+++ b/tests/Videra.Core.IntegrationTests/Videra.Core.IntegrationTests.csproj
@@ -13,12 +13,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Videra.Core.Tests/Samples/SurfaceChartsDemoViewportBehaviorTests.cs b/tests/Videra.Core.Tests/Samples/SurfaceChartsDemoViewportBehaviorTests.cs
index b7eeb863..6106780f 100644
--- a/tests/Videra.Core.Tests/Samples/SurfaceChartsDemoViewportBehaviorTests.cs
+++ b/tests/Videra.Core.Tests/Samples/SurfaceChartsDemoViewportBehaviorTests.cs
@@ -556,7 +556,7 @@ private static void SelectItem(ComboBox selector, ComboBoxItem item)
             .ToArray();
         var itemIndex = Array.IndexOf(items, item);
 
-        itemIndex.Should().BeGreaterOrEqualTo(0);
+        itemIndex.Should().BeGreaterThanOrEqualTo(0);
         selector.SelectedIndex = itemIndex;
     }
 
diff --git a/tests/Videra.Core.Tests/Videra.Core.Tests.csproj b/tests/Videra.Core.Tests/Videra.Core.Tests.csproj
index 81d08df3..b798de2e 100644
--- a/tests/Videra.Core.Tests/Videra.Core.Tests.csproj
+++ b/tests/Videra.Core.Tests/Videra.Core.Tests.csproj
@@ -18,9 +18,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/Videra.Platform.Linux.Tests/Videra.Platform.Linux.Tests.csproj b/tests/Videra.Platform.Linux.Tests/Videra.Platform.Linux.Tests.csproj
index c422c154..f806bf78 100644
--- a/tests/Videra.Platform.Linux.Tests/Videra.Platform.Linux.Tests.csproj
+++ b/tests/Videra.Platform.Linux.Tests/Videra.Platform.Linux.Tests.csproj
@@ -16,8 +16,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/Videra.Platform.Windows.Tests/Videra.Platform.Windows.Tests.csproj b/tests/Videra.Platform.Windows.Tests/Videra.Platform.Windows.Tests.csproj
index 1765f17d..ce18bd20 100644
--- a/tests/Videra.Platform.Windows.Tests/Videra.Platform.Windows.Tests.csproj
+++ b/tests/Videra.Platform.Windows.Tests/Videra.Platform.Windows.Tests.csproj
@@ -16,8 +16,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/Videra.Platform.macOS.Tests/Videra.Platform.macOS.Tests.csproj b/tests/Videra.Platform.macOS.Tests/Videra.Platform.macOS.Tests.csproj
index 1bc09d3e..2344c953 100644
--- a/tests/Videra.Platform.macOS.Tests/Videra.Platform.macOS.Tests.csproj
+++ b/tests/Videra.Platform.macOS.Tests/Videra.Platform.macOS.Tests.csproj
@@ -16,8 +16,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/Videra.SurfaceCharts.Avalonia.IntegrationTests/SurfaceChartTileSchedulingTests.cs b/tests/Videra.SurfaceCharts.Avalonia.IntegrationTests/SurfaceChartTileSchedulingTests.cs
index edd1c45f..9fce427c 100644
--- a/tests/Videra.SurfaceCharts.Avalonia.IntegrationTests/SurfaceChartTileSchedulingTests.cs
+++ b/tests/Videra.SurfaceCharts.Avalonia.IntegrationTests/SurfaceChartTileSchedulingTests.cs
@@ -547,7 +547,7 @@ public void CameraAwareRequestPlan_FartherCameraChangesSelection()
         var farPlan = scheduler.CreateRequestPlan(farViewState, farFrame, new Size(256, 256), SurfaceChartInteractionQuality.Refine);
 
         farPlan.OrderedKeys.Should().NotEqual(nearPlan.OrderedKeys);
-        farPlan.RetainedKeys.Should().NotBeEquivalentTo(nearPlan.RetainedKeys);
+        farPlan.RetainedKeys.SetEquals(nearPlan.RetainedKeys).Should().BeFalse();
     }
 
     [Fact]
@@ -614,7 +614,7 @@ public void CameraAwareRequestPlan_ObliqueCameraReordersDetailPriorityWithinSame
         var basePlan = scheduler.CreateRequestPlan(baseViewState, baseFrame, new Size(256, 256), SurfaceChartInteractionQuality.Refine);
         var obliquePlan = scheduler.CreateRequestPlan(obliqueViewState, obliqueFrame, new Size(256, 256), SurfaceChartInteractionQuality.Refine);
 
-        obliquePlan.RetainedKeys.Should().BeEquivalentTo(basePlan.RetainedKeys);
+        obliquePlan.RetainedKeys.SetEquals(basePlan.RetainedKeys).Should().BeTrue();
         obliquePlan.OrderedKeys.Should().NotEqual(basePlan.OrderedKeys);
     }
 
diff --git a/tests/Videra.SurfaceCharts.Avalonia.IntegrationTests/Videra.SurfaceCharts.Avalonia.IntegrationTests.csproj b/tests/Videra.SurfaceCharts.Avalonia.IntegrationTests/Videra.SurfaceCharts.Avalonia.IntegrationTests.csproj
index 1c4b2755..a3d1769c 100644
--- a/tests/Videra.SurfaceCharts.Avalonia.IntegrationTests/Videra.SurfaceCharts.Avalonia.IntegrationTests.csproj
+++ b/tests/Videra.SurfaceCharts.Avalonia.IntegrationTests/Videra.SurfaceCharts.Avalonia.IntegrationTests.csproj
@@ -18,8 +18,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/Videra.SurfaceCharts.Benchmarks.Tests/Videra.SurfaceCharts.Benchmarks.Tests.csproj b/tests/Videra.SurfaceCharts.Benchmarks.Tests/Videra.SurfaceCharts.Benchmarks.Tests.csproj
index bb3ecacd..005e3cb2 100644
--- a/tests/Videra.SurfaceCharts.Benchmarks.Tests/Videra.SurfaceCharts.Benchmarks.Tests.csproj
+++ b/tests/Videra.SurfaceCharts.Benchmarks.Tests/Videra.SurfaceCharts.Benchmarks.Tests.csproj
@@ -14,8 +14,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/Videra.SurfaceCharts.Core.Tests/Videra.SurfaceCharts.Core.Tests.csproj b/tests/Videra.SurfaceCharts.Core.Tests/Videra.SurfaceCharts.Core.Tests.csproj
index ad0fea2d..eee723c0 100644
--- a/tests/Videra.SurfaceCharts.Core.Tests/Videra.SurfaceCharts.Core.Tests.csproj
+++ b/tests/Videra.SurfaceCharts.Core.Tests/Videra.SurfaceCharts.Core.Tests.csproj
@@ -14,8 +14,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/Videra.SurfaceCharts.Processing.Tests/Videra.SurfaceCharts.Processing.Tests.csproj b/tests/Videra.SurfaceCharts.Processing.Tests/Videra.SurfaceCharts.Processing.Tests.csproj
index 9e55150e..b2218cb9 100644
--- a/tests/Videra.SurfaceCharts.Processing.Tests/Videra.SurfaceCharts.Processing.Tests.csproj
+++ b/tests/Videra.SurfaceCharts.Processing.Tests/Videra.SurfaceCharts.Processing.Tests.csproj
@@ -14,8 +14,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="FluentAssertions" Version="8.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>