diff --git a/tests/data/test1220 b/tests/data/test1220
index d36524960..959abbf70 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 a2a8b3fad..cca329587 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 521d4db59..f0da50727 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 44a8bb591..2b8a2d524 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 b467d65f8..5de1599e1 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 f0cb5a8fd..c81a45e0a 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 493cc2289..ee2793f56 100644
--- a/tests/data/test557
+++ b/tests/data/test557
@@ -1,4 +1,10 @@
 <testcase>
+<info>
+<keywords>
+printf
+unittest
+</keywords>
+</info>
 #
 # Server-side
 <reply>