diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md
index fa743277..ea3f45b6 100644
--- a/actix-server/CHANGES.md
+++ b/actix-server/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Fix panic in test server.
 - Minimum supported Rust version (MSRV) is now 1.71.
 
 ## 2.5.0
diff --git a/actix-server/src/test_server.rs b/actix-server/src/test_server.rs
index 828e0216..5326874f 100644
--- a/actix-server/src/test_server.rs
+++ b/actix-server/src/test_server.rs
@@ -123,7 +123,9 @@ impl TestServerHandle {
 
     /// Connect to server, returning a Tokio `TcpStream`.
     pub fn connect(&self) -> io::Result<TcpStream> {
-        TcpStream::from_std(net::TcpStream::connect(self.addr)?)
+        let stream = net::TcpStream::connect(self.addr)?;
+        stream.set_nonblocking(true)?;
+        TcpStream::from_std(stream)
     }
 }