diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h
index 7b5e6979..6f3425a7 100644
--- a/lib/libwebsockets.h
+++ b/lib/libwebsockets.h
@@ -280,6 +280,8 @@ struct lws_tokens {
 	int token_len;
 };
 
+/* don't forget to update test server header dump accordingly */
+
 enum lws_token_indexes {
 	WSI_TOKEN_GET_URI,
 	WSI_TOKEN_POST_URI,
diff --git a/test-server/test-server.c b/test-server/test-server.c
index c43b9c45..2d17175f 100644
--- a/test-server/test-server.c
+++ b/test-server/test-server.c
@@ -109,6 +109,7 @@ dump_handshake_info(struct libwebsocket *wsi)
 	static const char *token_names[] = {
 		/*[WSI_TOKEN_GET_URI]		=*/ "GET URI",
 		/*[WSI_TOKEN_POST_URI]		=*/ "POST URI",
+		/*[WSI_TOKEN_OPTIONS_URI]	=*/ "options uri",
 		/*[WSI_TOKEN_HOST]		=*/ "Host",
 		/*[WSI_TOKEN_CONNECTION]	=*/ "Connection",
 		/*[WSI_TOKEN_KEY1]		=*/ "key 1",
@@ -133,7 +134,9 @@ dump_handshake_info(struct libwebsocket *wsi)
 		/*[WSI_TOKEN_HTTP]		=*/ "Http",
 
 		"Accept:",
+		"a-c-request-headers:",
 		"If-Modified-Since:",
+		"if-none-match:",
 		"Accept-Encoding:",
 		"Accept-Language:",
 		"Pragma:",