diff --git a/tests/data/test1220 b/tests/data/test1220
index d365249601cb154016d18771d2a3277cb8657d8c..959abbf7094014f84e8b1a79ab58a2bd87317862 100644
--- a/tests/data/test1220
+++ b/tests/data/test1220
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+FILE
+URL
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test1221 b/tests/data/test1221
index a2a8b3fada9a3cdf1b0bcc4475e218f3a9df348d..cca3295875bf60fd06b93908f1349f96f782b43b 100644
--- a/tests/data/test1221
+++ b/tests/data/test1221
@@ -1,4 +1,9 @@
 <testcase>
+<info>
+<keywords>
+build system
+</keywords>
+</info>
 #
 # Client-side
 <client>
diff --git a/tests/data/test1222 b/tests/data/test1222
index 521d4db596692961c01be4c9e7650cab83e33ba1..f0da507273f350a129f3690f7e1cfdb71ca77fba 100644
--- a/tests/data/test1222
+++ b/tests/data/test1222
@@ -1,4 +1,9 @@
 <testcase>
+<info>
+<keywords>
+build system
+</keywords>
+</info>
 #
 # Client-side
 <client>
diff --git a/tests/data/test508 b/tests/data/test508
index 44a8bb59104cf3fb6c72c947cbd26b8241e73fc6..2b8a2d5244916dd25f38529805fafa1a2a558d86 100644
--- a/tests/data/test508
+++ b/tests/data/test508
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+POST
+POST callback
+</keywords>
+</info>
 #
 # Server-side
 <reply>
diff --git a/tests/data/test509 b/tests/data/test509
index b467d65f85a8525eef478cd4f3cbc11e8d0badf8..5de1599e1a095dbcd1aefb0a959d354f108ba8d9 100644
--- a/tests/data/test509
+++ b/tests/data/test509
@@ -1,4 +1,9 @@
 <testcase>
+<info>
+<keywords>
+memory callbacks
+</keywords>
+</info>
 #
 # Server-side
 <reply>
diff --git a/tests/data/test517 b/tests/data/test517
index f0cb5a8fd7c66b81cba0a11e0150588c1175fb31..c81a45e0a832966143e254fc7c686fc8cd01650f 100644
--- a/tests/data/test517
+++ b/tests/data/test517
@@ -1,4 +1,10 @@
 <testcase>
+<info>
+<keywords>
+getdate
+unittest
+</keywords>
+</info>
 #
 # Server-side
 <reply>
diff --git a/tests/data/test557 b/tests/data/test557
index 493cc2289becfb4ca42efcacf1f127505571f654..ee2793f56b5611c2d86612f2b40def3da421c4f0 100644
--- a/tests/data/test557
+++ b/tests/data/test557
@@ -1,4 +1,10 @@
 <testcase>
+<info>
+<keywords>
+printf
+unittest
+</keywords>
+</info>
 #
 # Server-side
 <reply>