diff --git a/tests/html-escape.c b/tests/html-escape.c
index c5be1179..a07356b7 100644
--- a/tests/html-escape.c
+++ b/tests/html-escape.c
@@ -25,6 +25,7 @@
 #include <netdb.h>
 #include "../src/html.h"
 #include "../src/html.c"
+#include "../src/common/common.h"
 
 static char *strings[] =
 {
@@ -60,7 +61,7 @@ int main(void)
 	unsigned i;
 	unsigned len;
 
-	for (i=0;i<sizeof(encoded_strings)/sizeof(encoded_strings[0]);i++) {
+	for (i=0;i<ARRAY_SIZE(encoded_strings);i++) {
 		dec = unescape_html(NULL, encoded_strings[i], strlen(encoded_strings[i]), &len);
 		if (dec == NULL) {
 			fprintf(stderr, "failed to unescape %s\n", encoded_strings[i]);
diff --git a/tests/json-escape.c b/tests/json-escape.c
index a1ffd8ab..081f50fb 100644
--- a/tests/json-escape.c
+++ b/tests/json-escape.c
@@ -25,6 +25,7 @@
 #include <netdb.h>
 #include "../src/occtl/json.h"
 #include "../src/occtl/json.c"
+#include "../src/common/common.h"
 
 static char *strings[] =
 {
@@ -52,7 +53,7 @@ int main(void)
 	char *p;
 	unsigned i;
 
-	for (i=0;i<sizeof(strings)/sizeof(strings[0]);i++) {
+	for (i=0;i<ARRAY_SIZE(strings);i++) {
 		tmp[0] = 0;
 		p = json_escape_val(tmp, sizeof(tmp), strings[i]);
 		if (strcmp(p, encoded_strings[i]) != 0) {
diff --git a/tests/url-escape.c b/tests/url-escape.c
index 3b5a3883..d4306a25 100644
--- a/tests/url-escape.c
+++ b/tests/url-escape.c
@@ -46,7 +46,7 @@ int main(void)
 	unsigned i;
 	unsigned len;
 
-	for (i=0;i<sizeof(strings)/sizeof(strings[0]);i++) {
+	for (i=0;i<ARRAY_SIZE(strings);i++) {
 		dec = unescape_url(NULL, strings[i], strlen(strings[i]), &len);
 		if (strcmp(dec, decoded_strings[i]) != 0) {
 			fprintf(stderr, "string %d, fails decoding:\n\tinput: '%s'\n\toutput: '%s'\n", i, decoded_strings[i], dec);