diff --git a/src/qos_core/src/io/stream.rs b/src/qos_core/src/io/stream.rs
index a695694a..f1d6af27 100644
--- a/src/qos_core/src/io/stream.rs
+++ b/src/qos_core/src/io/stream.rs
@@ -372,6 +372,7 @@ mod test {
 		os::{fd::AsRawFd, unix::net::UnixListener},
 		path::Path,
 		str::from_utf8,
+		sync::{Arc, Barrier},
 		thread,
 	};
 
@@ -391,9 +392,14 @@ mod test {
 		pub fn new(path: String) -> Self {
 			Self { path }
 		}
-		pub fn start(&mut self) {
+		pub fn start(&mut self) -> Arc<Barrier> {
 			let listener = UnixListener::bind(&self.path).unwrap();
 			let path = self.path.clone();
+
+            // Create a barrier to synchronize between server and client
+            let barrier = Arc::new(Barrier::new(2));
+            let server_barrier = Arc::clone(&barrier);
+
 			thread::spawn(move || {
 				let (mut stream, _peer_addr) = listener.accept().unwrap();
 
@@ -406,15 +412,18 @@ mod test {
 					let _ = stream.write(b"PONG").unwrap();
 				}
 
-				// Then shutdown the server
-				let _ = shutdown(listener.as_raw_fd(), Shutdown::Both);
-				let _ = close(listener.as_raw_fd());
+                // Wait for the client to signal that it's done
+                server_barrier.wait();
 
-				let server_socket = Path::new(&path);
-				if server_socket.exists() {
-					drop(std::fs::remove_file(server_socket));
-				}
+                // Remove the socket file after shutting down
+                let server_socket = Path::new(&path);
+                if server_socket.exists() {
+                    let _ = std::fs::remove_file(server_socket);
+                }
 			});
+
+            // Return the barrier to the client to allow for synchronization
+            barrier
 		}
 	}
 
@@ -446,9 +455,7 @@ mod test {
 		// request
 		let mut server =
 			HarakiriPongServer::new(socket_server_path.to_string());
-		thread::spawn(move || {
-			server.start();
-		});
+        let barrier = server.start();
 
 		// Now create a stream connecting to this mini-server
 		let unix_addr =
@@ -459,12 +466,15 @@ mod test {
 		// Write "PING"
 		let written = pong_stream.write(b"PING").unwrap();
 		assert_eq!(written, 4);
-
+		
 		// Read, and expect "PONG"
 		let mut resp = [0u8; 4];
 		let res = pong_stream.read(&mut resp).unwrap();
 		assert_eq!(res, 4);
 		assert_eq!(from_utf8(&resp).unwrap(), "PONG");
+
+        // Signal to the server that the client is done
+        barrier.wait();
 	}
 
 	#[test]