diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 1225a367ca..616adcda35 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'.
+
+
+
+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.
+
+
+
§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 7ddff50d1f..93a0f56263 100644
--- a/tests/data/test1
+++ b/tests/data/test1
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP GET
+
+
+
#
# Server-side
diff --git a/tests/data/test2 b/tests/data/test2
index ecc996a6c2..e2aedff7bc 100644
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP GET
+HTTP Basic auth
+
+
#
# Server-side
diff --git a/tests/data/test3 b/tests/data/test3
index bf3d01dd60..b5e8ea71fe 100644
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -1,6 +1,14 @@
+
+
+HTTP
+HTTP POST
+HTTP Basic auth
+HTTP response-body but Content-Length: set to 0
+
+
#
# Server-side
-
+
HTTP/1.0 200 OK
Server: test-server/fake
diff --git a/tests/data/test4 b/tests/data/test4
index 65f3ba0901..2577343892 100644
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -1,6 +1,14 @@
+
+
+HTTP
+HTTP GET
+HTTP added headers
+HTTP replaced headers
+
+
#
# Server-side
-
+
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 0a3d21f3a5..ad51eac523 100644
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -1,3 +1,10 @@
+
+
+HTTP
+HTTP GET
+HTTP proxy
+
+
#
# Server-side