diff --git a/Directory.Packages.props b/Directory.Packages.props
index 0f70553..6b81a0d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -11,7 +11,7 @@
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageVersion Include="Moq" Version="4.20.70" />
         <PackageVersion Include="NetCoreServer" Version="8.0.7" />
-        <PackageVersion Include="xunit" Version="2.9.2"/>
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2"/>
+        <PackageVersion Include="xunit.v3" Version="0.7.0-pre.15"/>
+        <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0-pre.49"/>
     </ItemGroup>
 </Project>
diff --git a/RyuSocks.Test.Integration/RyuSocks.Test.Integration.csproj b/RyuSocks.Test.Integration/RyuSocks.Test.Integration.csproj
index 72e5f9c..80e8155 100644
--- a/RyuSocks.Test.Integration/RyuSocks.Test.Integration.csproj
+++ b/RyuSocks.Test.Integration/RyuSocks.Test.Integration.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <OutputType>Exe</OutputType>
         <TargetFramework>net9.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
@@ -11,7 +12,7 @@
         <PackageReference Include="Docker.DotNet" />
         <PackageReference Include="FluentFTP" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.v3" />
         <PackageReference Include="xunit.runner.visualstudio">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/RyuSocks.Test/RyuSocks.Test.csproj b/RyuSocks.Test/RyuSocks.Test.csproj
index f60ac9a..48aba02 100644
--- a/RyuSocks.Test/RyuSocks.Test.csproj
+++ b/RyuSocks.Test/RyuSocks.Test.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <OutputType>Exe</OutputType>
         <TargetFramework>net9.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
@@ -17,7 +18,7 @@
         </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="Moq" />
-        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.v3" />
         <PackageReference Include="xunit.runner.visualstudio">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/RyuSocks.Test/Utils/EnumDataAttribute.cs b/RyuSocks.Test/Utils/EnumDataAttribute.cs
index bf1fb16..b95e632 100644
--- a/RyuSocks.Test/Utils/EnumDataAttribute.cs
+++ b/RyuSocks.Test/Utils/EnumDataAttribute.cs
@@ -15,19 +15,29 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Threading.Tasks;
+using Xunit;
 using Xunit.Sdk;
+using Xunit.v3;
 
 namespace RyuSocks.Test.Utils
 {
     public class EnumDataAttribute<T> : DataAttribute
         where T : struct, Enum
     {
-        public override IEnumerable<object[]> GetData(MethodInfo testMethod)
+        public override bool SupportsDiscoveryEnumeration() => true;
+
+        public override ValueTask<IReadOnlyCollection<ITheoryDataRow>> GetData(MethodInfo testMethod, DisposalTracker disposalTracker)
         {
-            foreach (T value in Enum.GetValues<T>())
+            T[] values = Enum.GetValues<T>();
+            TheoryDataRow<T>[] rows = new TheoryDataRow<T>[values.Length];
+
+            for (int i = 0; i < values.Length; i++)
             {
-                yield return [value];
+                rows[i] = new TheoryDataRow<T>(values[i]);
             }
+
+            return ValueTask.FromResult<IReadOnlyCollection<ITheoryDataRow>>(rows);
         }
     }
 }
diff --git a/RyuSocks.Test/Utils/RangeDataAttribute.cs b/RyuSocks.Test/Utils/RangeDataAttribute.cs
index c9b63bd..925bd0f 100644
--- a/RyuSocks.Test/Utils/RangeDataAttribute.cs
+++ b/RyuSocks.Test/Utils/RangeDataAttribute.cs
@@ -15,7 +15,10 @@
 using System.Collections.Generic;
 using System.Numerics;
 using System.Reflection;
+using System.Threading.Tasks;
+using Xunit;
 using Xunit.Sdk;
+using Xunit.v3;
 
 namespace RyuSocks.Test.Utils
 {
@@ -26,6 +29,8 @@ public class RangeDataAttribute<T> : DataAttribute
         private readonly T _max;
         private readonly T[] _extraElements;
 
+        public override bool SupportsDiscoveryEnumeration() => true;
+
         public RangeDataAttribute(T min, T max, params T[] extraElements)
         {
             _min = min;
@@ -33,21 +38,21 @@ public RangeDataAttribute(T min, T max, params T[] extraElements)
             _extraElements = extraElements;
         }
 
-        public override IEnumerable<object[]> GetData(MethodInfo testMethod)
+        public override ValueTask<IReadOnlyCollection<ITheoryDataRow>> GetData(MethodInfo testMethod, DisposalTracker disposalTracker)
         {
-            List<object> data = [];
+            List<TheoryDataRow<T[]>> data = [];
 
             for (T i = _min; i < _max; i++)
             {
-                data.Add(i);
+                data.Add(new TheoryDataRow<T[]>([i]));
             }
 
             foreach (T element in _extraElements)
             {
-                data.Add(element);
+                data.Add(new TheoryDataRow<T[]>([element]));
             }
 
-            return [[data.ToArray()]];
+            return ValueTask.FromResult<IReadOnlyCollection<ITheoryDataRow>>(data);
         }
     }
 }
diff --git a/RyuSocks.Test/Utils/StringDataAttribute.cs b/RyuSocks.Test/Utils/StringDataAttribute.cs
index d01d6be..6c5a629 100644
--- a/RyuSocks.Test/Utils/StringDataAttribute.cs
+++ b/RyuSocks.Test/Utils/StringDataAttribute.cs
@@ -17,16 +17,22 @@
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
+using System.Threading.Tasks;
+using Xunit;
 using Xunit.Sdk;
+using Xunit.v3;
 
 namespace RyuSocks.Test.Utils
 {
     public class StringDataAttribute : DataAttribute
     {
+        private const char Char = 'a';
         private readonly int _min;
         private readonly int _max;
         private int _count;
 
+        public override bool SupportsDiscoveryEnumeration() => true;
+
         public StringDataAttribute(int min, int max, int count)
         {
             _min = min;
@@ -41,9 +47,9 @@ public StringDataAttribute(int firstLength, int secondLength)
             _count = 2;
         }
 
-        public override IEnumerable<object[]> GetData(MethodInfo testMethod)
+        public override ValueTask<IReadOnlyCollection<ITheoryDataRow>> GetData(MethodInfo testMethod, DisposalTracker disposalTracker)
         {
-            List<object[]> data = [];
+            List<TheoryDataRow<string>> data = [];
             StringBuilder builder = new();
             int currentMin = _min;
             int currentMax = _max;
@@ -60,8 +66,8 @@ public override IEnumerable<object[]> GetData(MethodInfo testMethod)
                 {
                     isMin = false;
 
-                    builder.Append('a', currentMin);
-                    data.Add([builder.ToString()]);
+                    builder.Append(Char, currentMin);
+                    data.Add(new TheoryDataRow<string>(builder.ToString()));
 
                     if (!isMinReverse)
                     {
@@ -90,8 +96,8 @@ public override IEnumerable<object[]> GetData(MethodInfo testMethod)
                 {
                     isMin = true;
 
-                    builder.Append('a', currentMax);
-                    data.Add([builder.ToString()]);
+                    builder.Append(Char, currentMax);
+                    data.Add(new TheoryDataRow<string>(builder.ToString()));
 
                     if (!isMaxReverse)
                     {
@@ -118,7 +124,7 @@ public override IEnumerable<object[]> GetData(MethodInfo testMethod)
                 }
             }
 
-            return [.. data];
+            return ValueTask.FromResult<IReadOnlyCollection<ITheoryDataRow>>(data);
         }
     }
 }