diff --git a/Directory.Packages.props b/Directory.Packages.props
index 06eea01c8..365cdd296 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -28,8 +28,9 @@
     <PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="18.1.0" />
     <PackageVersion Include="Wiremock.Net" Version="2.6.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
-    <PackageVersion Include="Xunit.StaFact" Version="1.2.69" />
+    <PackageVersion Include="Xunit.StaFact" Version="3.0.13" />
     <PackageVersion Include="YamlDotNet" Version="18.1.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/KubernetesClient.Tests/AuthTests.cs b/tests/KubernetesClient.Tests/AuthTests.cs
index 23abf6208..79c90e9ff 100644
--- a/tests/KubernetesClient.Tests/AuthTests.cs
+++ b/tests/KubernetesClient.Tests/AuthTests.cs
@@ -21,7 +21,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace k8s.Tests
 {
diff --git a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj
index 1f58cb54d..0987f6b66 100644
--- a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj
+++ b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj
@@ -6,7 +6,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="MartinCostello.Logging.XUnit" />
       <PackageReference Include="FluentAssertions" />
       <PackageReference Include="Microsoft.Extensions.Logging" />
       <PackageReference Include="System.IO.Abstractions.TestingHelpers" />
@@ -23,7 +22,7 @@
     <PackageReference Include="NJsonSchema" />
     <PackageReference Include="NSwag.Core" />
     <PackageReference Include="System.Text.Json" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/KubernetesClient.Tests/KubernetesMetricsTests.cs b/tests/KubernetesClient.Tests/KubernetesMetricsTests.cs
index 96561a509..927474c8a 100644
--- a/tests/KubernetesClient.Tests/KubernetesMetricsTests.cs
+++ b/tests/KubernetesClient.Tests/KubernetesMetricsTests.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace k8s.Tests
 {
diff --git a/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs b/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs
index a8b159a48..cde2692c0 100644
--- a/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs
+++ b/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs
@@ -7,7 +7,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace k8s.Tests.LeaderElection
 {
diff --git a/tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs b/tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs
index 39e0bb94a..53d6ed449 100644
--- a/tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs
+++ b/tests/KubernetesClient.Tests/Logging/TestOutputLogger.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Reactive.Disposables;
-using Xunit.Abstractions;
+using Xunit;
 
 namespace k8s.Tests.Logging
 {
diff --git a/tests/KubernetesClient.Tests/Logging/TestOutputLoggerProvider.cs b/tests/KubernetesClient.Tests/Logging/TestOutputLoggerProvider.cs
index 48f0b83f8..fc6eb5f88 100644
--- a/tests/KubernetesClient.Tests/Logging/TestOutputLoggerProvider.cs
+++ b/tests/KubernetesClient.Tests/Logging/TestOutputLoggerProvider.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 using System;
-using Xunit.Abstractions;
+using Xunit;
 
 namespace k8s.Tests.Logging
 {
diff --git a/tests/KubernetesClient.Tests/Logging/TestOutputLoggingExtensions.cs b/tests/KubernetesClient.Tests/Logging/TestOutputLoggingExtensions.cs
index 4f94343c9..78a8d8681 100644
--- a/tests/KubernetesClient.Tests/Logging/TestOutputLoggingExtensions.cs
+++ b/tests/KubernetesClient.Tests/Logging/TestOutputLoggingExtensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 using System;
-using Xunit.Abstractions;
+using Xunit;
 
 namespace k8s.Tests.Logging
 {
diff --git a/tests/KubernetesClient.Tests/Mock/MockKubeApiServer.cs b/tests/KubernetesClient.Tests/Mock/MockKubeApiServer.cs
index 67a1bd72c..6a8dded98 100644
--- a/tests/KubernetesClient.Tests/Mock/MockKubeApiServer.cs
+++ b/tests/KubernetesClient.Tests/Mock/MockKubeApiServer.cs
@@ -10,7 +10,7 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using Xunit.Abstractions;
+using Xunit;
 
 namespace k8s.Tests.Mock
 {
diff --git a/tests/KubernetesClient.Tests/OperatingSystemDependentFactAttribute.cs b/tests/KubernetesClient.Tests/OperatingSystemDependentFactAttribute.cs
index 983c37e9b..6e9034a8e 100644
--- a/tests/KubernetesClient.Tests/OperatingSystemDependentFactAttribute.cs
+++ b/tests/KubernetesClient.Tests/OperatingSystemDependentFactAttribute.cs
@@ -1,18 +1,15 @@
 using System.Runtime.InteropServices;
 using Xunit;
+using Xunit.v3;
 
 namespace k8s.Tests
 {
-    public class OperatingSystemDependentFactAttribute : FactAttribute
+    public class OperatingSystemDependentFactAttribute : FactAttribute, IFactAttribute
     {
         public OperatingSystems Include { get; set; } = OperatingSystems.Linux | OperatingSystems.Windows | OperatingSystems.OSX;
         public OperatingSystems Exclude { get; set; }
 
-        public override string Skip
-        {
-            get => IsOS(Include) && !IsOS(Exclude) ? null : "Not compatible with current OS";
-            set { }
-        }
+        string IFactAttribute.Skip => IsOS(Include) && !IsOS(Exclude) ? null : "Not compatible with current OS";
 
         private bool IsOS(OperatingSystems operatingSystems)
         {
diff --git a/tests/KubernetesClient.Tests/PodExecTests.cs b/tests/KubernetesClient.Tests/PodExecTests.cs
index d37e098e8..e6305c4df 100644
--- a/tests/KubernetesClient.Tests/PodExecTests.cs
+++ b/tests/KubernetesClient.Tests/PodExecTests.cs
@@ -14,7 +14,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace k8s.Tests
 {
diff --git a/tests/KubernetesClient.Tests/SerializationTests.cs b/tests/KubernetesClient.Tests/SerializationTests.cs
index b11cba313..4427f69d5 100644
--- a/tests/KubernetesClient.Tests/SerializationTests.cs
+++ b/tests/KubernetesClient.Tests/SerializationTests.cs
@@ -3,7 +3,6 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace k8s.Tests
 {
diff --git a/tests/KubernetesClient.Tests/V1StatusObjectViewTests.cs b/tests/KubernetesClient.Tests/V1StatusObjectViewTests.cs
index bdd315ed2..375ea96f8 100644
--- a/tests/KubernetesClient.Tests/V1StatusObjectViewTests.cs
+++ b/tests/KubernetesClient.Tests/V1StatusObjectViewTests.cs
@@ -2,7 +2,6 @@
 using k8s.Tests.Mock;
 using System.Text.Json;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace k8s.Tests
 {
diff --git a/tests/KubernetesClient.Tests/WatchTests.cs b/tests/KubernetesClient.Tests/WatchTests.cs
index 53259d770..2b55596f5 100644
--- a/tests/KubernetesClient.Tests/WatchTests.cs
+++ b/tests/KubernetesClient.Tests/WatchTests.cs
@@ -12,7 +12,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace k8s.Tests
 {
diff --git a/tests/KubernetesClient.Tests/WebSocketTestBase.cs b/tests/KubernetesClient.Tests/WebSocketTestBase.cs
index 6766cc585..b0d2ba7de 100644
--- a/tests/KubernetesClient.Tests/WebSocketTestBase.cs
+++ b/tests/KubernetesClient.Tests/WebSocketTestBase.cs
@@ -14,7 +14,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace k8s.Tests
 {