diff --git a/GFramework.Core.Tests/Architectures/ArchitectureModulesBehaviorTests.cs b/GFramework.Core.Tests/Architectures/ArchitectureModulesBehaviorTests.cs
index 195a0f3c..dff3af2c 100644
--- a/GFramework.Core.Tests/Architectures/ArchitectureModulesBehaviorTests.cs
+++ b/GFramework.Core.Tests/Architectures/ArchitectureModulesBehaviorTests.cs
@@ -176,6 +176,6 @@ public sealed class TrackingPipelineBehavior<TRequest, TResponse> : IPipelineBeh
         CancellationToken cancellationToken)
     {
         InvocationCount++;
-        return await next(message, cancellationToken);
+        return await next(message, cancellationToken).ConfigureAwait(false);
     }
 }
diff --git a/GFramework.Core.Tests/Extensions/AsyncExtensionsTests.cs b/GFramework.Core.Tests/Extensions/AsyncExtensionsTests.cs
index 0b96d022..a0d1ebdf 100644
--- a/GFramework.Core.Tests/Extensions/AsyncExtensionsTests.cs
+++ b/GFramework.Core.Tests/Extensions/AsyncExtensionsTests.cs
@@ -227,12 +227,17 @@ public class AsyncExtensionsTests
     [Test]
     public async Task WithRetry_Should_Respect_ShouldRetry_Predicate()
     {
+        static Task<int> ThrowShouldNotRetry(string parameterName)
+        {
+            throw new ArgumentException("Should not retry", nameof(parameterName));
+        }
+
         // Arrange
         var attemptCount = 0;
         Func<Task<int>> taskFactory = () =>
         {
             attemptCount++;
-            throw new ArgumentException("Should not retry");
+            return ThrowShouldNotRetry(nameof(taskFactory));
         };
 
         // Act & Assert