diff --git a/test/iscidraddr_test.c b/test/iscidraddr_test.c
index 0c86b42..6a888b6 100644
--- a/test/iscidraddr_test.c
+++ b/test/iscidraddr_test.c
@@ -4,36 +4,28 @@
 #include <stdio.h>
 
 const char *valid[] = {
-  "192.168.1.1",
-  "0.0.0.0",
-  "255.255.255.255",
-  "123.45.67.89",
+  /* valid IPv4 */
+  "192.168.1.1", "0.0.0.0",
+  "255.255.255.255", "123.45.67.89",
   "123.45.67.255",
-  "10.0.0.1/32"
+  /* valid cidr notation */
+  "10.0.0.1/8", "10.0.0.1/16",
+  "10.0.0.1/24", "10.0.0.1/32",
 };
 
 const char *invalid[] = {
-  "123.45.67.891",
-  "192.168.500.1",
-  ".192.168.1.1",
-  "192..168.1.1",
-  "192.168.1.1.",
-  "192.168.1.1..",
-  "192.168.1.1a",
+  /* invalid IPv4  */
+  "123.45.67.891", "192.168.500.1",
+  ".192.168.1.1", "192..168.1.1",
+  "192.168.1.1.", "192.168.1.1..",
+  "192.168.1.1a", "192.2.2.",
+  /* invalid cidr notation */
+  "10.0.0.1/33", "127.0.0.1/64",
+  "127.0.0.1/", "127.0.0.1/a",
+  "/", "/123.","127/2",
+  /* edge cases */
   "555555555555555555555555555555555555",
-  "",
-  ".",
-  ".......",
-  "192.2.2.",
-  "...4",
-  "4...4",
-  "10.0.0.1/33",
-  "127.0.0.1/64",
-  "127.0.0.1/",
-  "127.0.0.1/a",
-  "/",
-  "/123.",
-  "127/2",
+  "", ".", ".......", "...4", "4...4",
   NULL
 };
 
diff --git a/test/isinetaddr_test.c b/test/isinetaddr_test.c
index 627f7e8..c0ab22a 100644
--- a/test/isinetaddr_test.c
+++ b/test/isinetaddr_test.c
@@ -4,28 +4,21 @@
 #include <stdio.h>
 
 const char *valid[] = {
-  "192.168.1.1",
-  "0.0.0.0",
-  "255.255.255.255",
-  "123.45.67.89",
-  "123.45.67.255"
+  /* valid IPv4 */
+  "192.168.1.1", "0.0.0.0",
+  "255.255.255.255", "123.45.67.89",
+  "123.45.67.255",
 };
 
 const char *invalid[] = {
-  "123.45.67.891",
-  "192.168.500.1",
-  ".192.168.1.1",
-  "192..168.1.1",
-  "192.168.1.1.",
-  "192.168.1.1..",
-  "192.168.1.1a",
+  /* invalid IPv4  */
+  "123.45.67.891", "192.168.500.1",
+  ".192.168.1.1", "192..168.1.1",
+  "192.168.1.1.", "192.168.1.1..",
+  "192.168.1.1a", "192.2.2.",
+  /* edge cases */
   "555555555555555555555555555555555555",
-  "",
-  ".",
-  ".......",
-  "192.2.2.",
-  "...4",
-  "4...4",
+  "", ".", ".......", "...4", "4...4",
   NULL
 };