diff --git a/Tests/MQTTnet.Core.Tests/TestServerExtensions.cs b/Tests/MQTTnet.Core.Tests/TestServerExtensions.cs
index 2826f8a..cbb278c 100644
--- a/Tests/MQTTnet.Core.Tests/TestServerExtensions.cs
+++ b/Tests/MQTTnet.Core.Tests/TestServerExtensions.cs
@@ -26,8 +26,8 @@ namespace MQTTnet.Core.Tests
             
             try
             {
-                await client.PublishAsync(message);
-                await tcs.Task;
+                await client.PublishAsync(message).ConfigureAwait(false);
+                await tcs.Task.ConfigureAwait(false);
             }
             finally
             {