diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs
index 1849541e23..4f2de8644d 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs
@@ -94,7 +94,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                 using (var connection = server.CreateConnection())
                 {
                     await connection.SendAllTryEnd(request);
-                    await ReceiveBadRequestResponse(connection);
+                    await ReceiveBadRequestResponse(connection, server.Context.DateHeaderValue);
                 }
             }
         }
@@ -131,7 +131,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                 using (var connection = server.CreateConnection())
                 {
                     await connection.SendAll(request);
-                    await ReceiveBadRequestResponse(connection);
+                    await ReceiveBadRequestResponse(connection, server.Context.DateHeaderValue);
                 }
             }
         }
@@ -167,7 +167,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                 using (var connection = server.CreateConnection())
                 {
                     await connection.SendAllTryEnd($"GET / HTTP/1.1\r\n{rawHeaders}");
-                    await ReceiveBadRequestResponse(connection);
+                    await ReceiveBadRequestResponse(connection, server.Context.DateHeaderValue);
                 }
             }
         }
@@ -184,7 +184,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                         "H\u00eb\u00e4d\u00ebr: value",
                         "",
                         "");
-                    await ReceiveBadRequestResponse(connection);
+                    await ReceiveBadRequestResponse(connection, server.Context.DateHeaderValue);
                 }
             }
         }
@@ -211,12 +211,12 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                 using (var connection = server.CreateConnection())
                 {
                     await connection.SendAllTryEnd($"GET {path} HTTP/1.1\r\n");
-                    await ReceiveBadRequestResponse(connection);
+                    await ReceiveBadRequestResponse(connection, server.Context.DateHeaderValue);
                 }
             }
         }
 
-        private async Task ReceiveBadRequestResponse(TestConnection connection)
+        private async Task ReceiveBadRequestResponse(TestConnection connection, string expectedDateHeaderValue)
         {
             await connection.Receive(
                 "HTTP/1.1 400 Bad Request",
@@ -225,7 +225,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                 "Connection: close",
                 "");
             await connection.ReceiveForcedEnd(
-                $"Date: {connection.Server.Context.DateHeaderValue}",
+                $"Date: {expectedDateHeaderValue}",
                 "Content-Length: 0",
                 "",
                 "");
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs
index 1c9eefb324..e9cca977c8 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs
@@ -1191,7 +1191,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                         "");
                     await connection.ReceiveEnd(
                         "HTTP/1.1 200 OK",
-                        $"Date: {connection.Server.Context.DateHeaderValue}",
+                        $"Date: {server.Context.DateHeaderValue}",
                         $"Content-Length: {expectedPath.Length.ToString()}",
                         "",
                         $"{expectedPath}");
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs
index 5c54ca7d13..64a6586913 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs
@@ -22,14 +22,11 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
         private NetworkStream _stream;
         private StreamReader _reader;
 
-        public TestConnection(TestServer server)
+        public TestConnection(int port)
         {
-            Server = server;
-            Create(server.Port);
+            Create(port);
         }
 
-        public TestServer Server { get; }
-
         public void Create(int port)
         {
             _socket = CreateConnectedLoopbackSocket(port);
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs
index f4a840d967..e05b526735 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs
@@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
 
         public TestConnection CreateConnection()
         {
-            return new TestConnection(this);
+            return new TestConnection(Port);
         }
 
         public void Dispose()