diff --git a/Directory.Build.props b/Directory.Build.props
index 01f9fdd9fd6..838680f9280 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,8 +19,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <XunitVersion>2.8.1</XunitVersion>
-    <Xunit3Version>2.0.1</Xunit3Version>
-    <Xunit3RunnerVersion>3.0.2</Xunit3RunnerVersion>
+    <Xunit3Version>3.2.2</Xunit3Version>
+    <Xunit3RunnerVersion>3.1.5</Xunit3RunnerVersion>
     <XunitRunnerVersion>2.8.1</XunitRunnerVersion>
     <TestSdkVersion>17.9.0</TestSdkVersion>
     <HyperionVersion>0.12.2</HyperionVersion>
diff --git a/src/contrib/testkits/Akka.TestKit.Xunit/Attributes/LocalFactAttribute.cs b/src/contrib/testkits/Akka.TestKit.Xunit/Attributes/LocalFactAttribute.cs
index 97ef7802810..a2d8d7b8f72 100644
--- a/src/contrib/testkits/Akka.TestKit.Xunit/Attributes/LocalFactAttribute.cs
+++ b/src/contrib/testkits/Akka.TestKit.Xunit/Attributes/LocalFactAttribute.cs
@@ -6,6 +6,7 @@
 //-----------------------------------------------------------------------
 
 using System;
+using System.Runtime.CompilerServices;
 using Xunit;
 using Xunit.v3;
 
@@ -24,7 +25,9 @@ namespace Akka.TestKit.Xunit.Attributes;
 /// </summary>
 [XunitTestCaseDiscoverer(typeof(FactDiscoverer))]
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-public class LocalFactAttribute: Attribute, IFactAttribute
+public class LocalFactAttribute(
+    [CallerFilePath] string? sourceFilePath = null,
+    [CallerLineNumber] int sourceLineNumber = -1): Attribute, IFactAttribute
 {
     private const string EnvironmentVariableName = "XUNIT_SKIP_LOCAL_FACT";
 
@@ -48,6 +51,12 @@ public class LocalFactAttribute: Attribute, IFactAttribute
     /// <inheritdoc/>
     public string? SkipWhen { get; set; }
 
+    /// <inheritdoc/>
+    public string? SourceFilePath { get; } = sourceFilePath;
+    
+    /// <inheritdoc/>
+    public int? SourceLineNumber { get; } = sourceLineNumber < 1 ? null : sourceLineNumber;
+
     /// <inheritdoc/>
     public int Timeout { get; set; }
     
diff --git a/src/contrib/testkits/Akka.TestKit.Xunit/Attributes/WindowsFactAttribute.cs b/src/contrib/testkits/Akka.TestKit.Xunit/Attributes/WindowsFactAttribute.cs
index e7cfb8dcc38..a293ea2c544 100644
--- a/src/contrib/testkits/Akka.TestKit.Xunit/Attributes/WindowsFactAttribute.cs
+++ b/src/contrib/testkits/Akka.TestKit.Xunit/Attributes/WindowsFactAttribute.cs
@@ -6,6 +6,7 @@
 //-----------------------------------------------------------------------
 
 using System;
+using System.Runtime.CompilerServices;
 using Xunit.v3;
 
 namespace Akka.TestKit.Xunit.Attributes
@@ -20,7 +21,9 @@ namespace Akka.TestKit.Xunit.Attributes
     /// set will always be skipped, regardless of the environment variable content.
     /// </para>
     /// </summary>
-    public class WindowsFactAttribute : Attribute, IFactAttribute
+    public class WindowsFactAttribute(
+        [CallerFilePath] string? sourceFilePath = null,
+        [CallerLineNumber] int sourceLineNumber = -1) : Attribute, IFactAttribute
     {
         private string? _skip;
 
@@ -43,6 +46,12 @@ public class WindowsFactAttribute : Attribute, IFactAttribute
         /// <inheritdoc/>
         public string? SkipWhen { get; set; }
 
+        /// <inheritdoc/>
+        public string? SourceFilePath { get; } = sourceFilePath;
+        
+        /// <inheritdoc/>
+        public int? SourceLineNumber { get; } = sourceLineNumber < 1 ? null : sourceLineNumber;
+
         /// <inheritdoc/>
         public int Timeout { get; set; }