diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 1225a367ca07ebf929d057466838be721edf9c6a..616adcda355d6d733eba2aa20a2ff72f710af672 100644
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -13,6 +13,16 @@ command has been run ended up correctly.
 specified, that will be checked/used if specified. This document includes all
 the subsections currently supported.
 
+Main sections are 'info', 'reply', 'client' and 'verify'.
+
+<info>
+<keywords>
+A newline-separated list of keywords describing what this test case uses and
+tests. Try to use an already used keyword. These keywords will be used for
+statistical/informational purposes.
+</keywords>
+</info>
+
 <reply>
 <data [nocheck=1] [sendzero=yes] [base64=yes]>
 §data to sent to the client on its request and later verified that it arrived
diff --git a/tests/data/test1 b/tests/data/test1
index 7ddff50d1febb7d4a4fec79e87bcc88f1ce2cae3..93a0f56263b9c6eed584ac8fd25b170b7852f043 100644
--- a/tests/data/test1
+++ b/tests/data/test1
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply name="1">
diff --git a/tests/data/test2 b/tests/data/test2
index ecc996a6c2bc735fdee679ce2b8b6870b1dbbed8..e2aedff7bc31dfc8b04a7286cb83ad481f3c50d3 100644
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP Basic auth
+</keywords>
+</info>
 #
 # Server-side
 <reply>
diff --git a/tests/data/test3 b/tests/data/test3
index bf3d01dd601c80d1964652d6f1969360985ea5db..b5e8ea71feb218a1695b1e0fe7287631d1b22508 100644
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -1,6 +1,14 @@
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP Basic auth
+HTTP response-body but Content-Length: set to 0
+</keywords>
+</info>
 #
 # Server-side
-<reply name="1">
+<reply>
 <data>
 HTTP/1.0 200 OK
 Server: test-server/fake
diff --git a/tests/data/test4 b/tests/data/test4
index 65f3ba0901c1c257ba276468df106e827d32a9a1..2577343892d161b8cf044c0701daaaa41c360a88 100644
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -1,6 +1,14 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP added headers
+HTTP replaced headers
+</keywords>
+</info>
 #
 # Server-side
-<reply name="1">
+<reply>
 <data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
diff --git a/tests/data/test5 b/tests/data/test5
index 0a3d21f3a563167bfdd43835fa8ae2effa0f2286..ad51eac523e987f23a7433b8bfde4cd9e0866e09 100644
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP proxy
+</keywords>
+</info>
 #
 # Server-side
 <reply>