diff --git a/src/network/client.rs b/src/network/client.rs
index 7feb5d7..1136f5c 100644
--- a/src/network/client.rs
+++ b/src/network/client.rs
@@ -58,7 +58,11 @@ impl Client {
         let settings_clone = settings.clone();
         let update_sender_clone = update_sender.clone();
 
+        let (hanshake_tx, handshake_rx) = tokio::sync::oneshot::channel::<bool>();
+
         tokio::spawn(async move {
+            let mut hanshake_tx = Some(hanshake_tx);
+
             loop {
                 tokio::select! {
                     oldest_msg = conn_reciever.recv() => {
@@ -78,10 +82,16 @@ impl Client {
 
                             ServerMessage::AcceptHandshake => {
                                 info!("Server accepted us! Yay :D");
+                                if let Some(hanshake_tx) = hanshake_tx.take() {
+                                    let _ = hanshake_tx.send(true);
+                                }
                             }
 
                             ServerMessage::DeclineHandshake { reason } => {
                                 error!("Server declined connection: {}", reason);
+                                if let Some(hanshake_tx) = hanshake_tx.take() {
+                                    let _ = hanshake_tx.send(false);
+                                }
                                 break;
                             }
 
@@ -99,10 +109,22 @@ impl Client {
             }
         });
 
-        Some(Client {
-            conn_sender_outgoing,
-            update_receiver: Some(update_receiver),
-        })
+        let is_handshake_accepted: bool = match handshake_rx.await {
+            Ok(is_accepted) => is_accepted,
+            Err(e) => {
+                error!("Error while receiving handshake: {}", e);
+                return None;
+            }
+        };
+
+        if is_handshake_accepted {
+            Some(Client {
+                conn_sender_outgoing,
+                update_receiver: Some(update_receiver),
+            })
+        } else {
+            None
+        }
     }
 
     async fn send_message(&mut self, msg: Result<Message<ClientMessage>, postcard::Error>) {
diff --git a/tests/integration.rs b/tests/integration.rs
index 07ac708..f98df00 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -1,5 +1,6 @@
 #[cfg(test)]
 mod tests {
+
     use tokio::time::Duration;
 
     use checkers::{
@@ -9,25 +10,35 @@ mod tests {
 
     #[tokio::test]
     async fn game_integration() {
+        let _ = env_logger::builder().is_test(true).try_init();
+
         tokio::spawn(async move {
             let mut server = Server::new().await;
             server.start().await;
             server.update().await;
         });
 
-        tokio::time::sleep(Duration::from_secs(2)).await; // wait for the server to run
+        tokio::time::sleep(Duration::from_secs(2)).await;
 
         let bot1_handle = tokio::spawn(async move {
             let bot1 = Bot::new(BotDificulty::Easy).await;
-            bot1.game_loop().await;
+            bot1.game_loop().await
         });
 
         let bot2_handle = tokio::spawn(async move {
             let bot2 = Bot::new(BotDificulty::Easy).await;
-            bot2.game_loop().await;
+            bot2.game_loop().await
         });
 
-        bot1_handle.await.unwrap();
-        bot2_handle.await.unwrap();
+        let bot1_result = bot1_handle.await.unwrap();
+        let bot2_result = bot2_handle.await.unwrap();
+
+        if bot1_result.is_some() && bot2_result.is_some() {
+            assert_eq!(bot1_result.unwrap(), bot2_result.unwrap());
+        } else if bot1_result.is_none() && bot2_result.is_none() {
+            ()
+        } else {
+            panic!("Bot result differanciate");
+        }
     }
 }