diff --git a/test-server/test-server-http.c b/test-server/test-server-http.c
index 16a49b0a..2f4dd083 100644
--- a/test-server/test-server-http.c
+++ b/test-server/test-server-http.c
@@ -137,15 +137,10 @@ int callback_http(struct lws *wsi, enum lws_callback_reasons reason, void *user,
 		dump_handshake_info(wsi);
 
 		/* dump the individual URI Arg parameters */
-		m = 1;
 		n = 0;
-		while (m > 0) {
-			m = lws_hdr_copy_fragment(wsi, buf, sizeof(buf),
-						  WSI_TOKEN_HTTP_URI_ARGS, n);
-			if (m < 0)
-				continue;
-			n++;
-			lwsl_info("URI Arg %d: %s\n", n, buf);
+		while (lws_hdr_copy_fragment(wsi, buf, sizeof(buf),
+					     WSI_TOKEN_HTTP_URI_ARGS, n) > 0) {
+			lwsl_info("URI Arg %d: %s\n", ++n, buf);
 		}
 
 		if (len < 1) {