diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs
index 9788b554e0..c6c1fe7075 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs
@@ -648,7 +648,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
 
         protected static async Task FlushAsync(PipeWriter writableBuffer)
         {
-            await writableBuffer.FlushAsync();
+            await writableBuffer.FlushAsync().AsTask().DefaultTimeout();
         }
 
         protected Task SendPreambleAsync() => SendAsync(new ArraySegment<byte>(Http2Connection.ClientPreface));
@@ -1161,7 +1161,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
                 Assert.Contains(expectedErrorMessage, expected => message.Exception.Message.Contains(expected));
             }
 
-            await _connectionTask;
+            await _connectionTask.DefaultTimeout();
             _pair.Application.Output.Complete();
         }