diff --git a/tests/client_server/client_server_test.cpp b/tests/client_server/client_server_test.cpp
index b701900e..f6906684 100644
--- a/tests/client_server/client_server_test.cpp
+++ b/tests/client_server/client_server_test.cpp
@@ -13,10 +13,13 @@ PIClientServer::Server * createServer() {
 
 bool waitLoop(std::function<bool()> exit_loop, const PISystemTime & timeout) {
 	PITimeMeasurer tm;
-	while (!exit_loop() && (tm.elapsed() < timeout)) {
+	while (tm.elapsed() < timeout) {
+		if (exit_loop()) {
+			return true;
+		}
 		piMinSleep();
 	}
-	return tm.elapsed() < timeout;
+	return false;
 }
 
 template<typename Client>