diff --git a/test/test_client_server.c b/test/test_client_server.c
index f20a97e..294e985 100644
--- a/test/test_client_server.c
+++ b/test/test_client_server.c
@@ -49,7 +49,7 @@ int run_service()
 int run_client()
 {
 	fprintf(stdout, "Client Started!\n");
-	sleep(10);
+	sleep(2);
 	fprintf(stdout, "Client Ending!\n");
 	return AXLCS_SUCCESS;
 }
diff --git a/test/test_driver_client_server.py b/test/test_driver_client_server.py
index edae52b..a0f38b5 100755
--- a/test/test_driver_client_server.py
+++ b/test/test_driver_client_server.py
@@ -18,13 +18,16 @@ def wait_for_completion(procname, proc, wait_time):
     return proc.returncode, outs, err
 
 if __name__ == '__main__':
+    errors = 0
     # Launch the server then the client
     server = subprocess.Popen(['./test_client_server server'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
     client = subprocess.Popen(['./test_client_server client'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
 
     # Wait for the client then the server to finish
-    server_ecode, server_out, server_err = wait_for_completion("axl_client", client, 120)
-    client_ecode, client_out, client_err = wait_for_completion("axl_server", server, 10)
+    client_ecode, client_out, client_err = wait_for_completion("axl_client", client, 120)
+    server_ecode, server_out, server_err = wait_for_completion("axl_server", server, 2)
 
     if server_ecode != 0 or client_ecode != 0:
-        sys.exit(server_ecode + client_ecode)
+        errors = server_ecode + client_ecode
+
+    sys.exit(errors)