diff --git a/Tests/HiveMQtt.Test/HiveMQClient/LWTTest.cs b/Tests/HiveMQtt.Test/HiveMQClient/LWTTest.cs
index fd78c13e..077fe0dc 100644
--- a/Tests/HiveMQtt.Test/HiveMQClient/LWTTest.cs
+++ b/Tests/HiveMQtt.Test/HiveMQClient/LWTTest.cs
@@ -63,7 +63,7 @@ public async Task Last_Will_With_Properties_Async()
         Assert.Equal(SubAckReasonCode.GrantedQoS1, result.Subscriptions[0].SubscribeReasonCode);
         Assert.Equal("last/will", result.Subscriptions[0].TopicFilter.Topic);
 
-        // Setup & Connect the client with LWT
+        // Setup & Connect another client with a LWT
         var options = new HiveMQClientOptions
         {
             LastWillAndTestament = new LastWillAndTestament("last/will", "last will message"),
@@ -87,7 +87,7 @@ public async Task Last_Will_With_Properties_Async()
         var disconnectResult = await client.DisconnectAsync(disconnectOptions).ConfigureAwait(false);
 
         // Wait until the LWT message is received
-        var taskResult = await taskLWTReceived.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
+        var taskResult = await taskLWTReceived.Task.WaitAsync(TimeSpan.FromSeconds(25)).ConfigureAwait(false);
         Assert.True(taskResult);
     }
 }
diff --git a/Tests/HiveMQtt.Test/HiveMQClient/LastWillAndTestamentBuilderTest.cs b/Tests/HiveMQtt.Test/HiveMQClient/LastWillAndTestamentBuilderTest.cs
index c7f9254f..72dd4761 100644
--- a/Tests/HiveMQtt.Test/HiveMQClient/LastWillAndTestamentBuilderTest.cs
+++ b/Tests/HiveMQtt.Test/HiveMQClient/LastWillAndTestamentBuilderTest.cs
@@ -98,7 +98,7 @@ public async Task Last_Will_With_Properties_Async()
         var disconnectResult = await client.DisconnectAsync(disconnectOptions).ConfigureAwait(false);
 
         // Wait until the LWT message is received
-        var taskResult = await taskLWTReceived.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
+        var taskResult = await taskLWTReceived.Task.WaitAsync(TimeSpan.FromSeconds(25)).ConfigureAwait(false);
         Assert.True(taskResult);
     }
 }