diff --git a/sysbench/control b/sysbench/control
index 1bc0305de..9d5913d75 100644
--- a/sysbench/control
+++ b/sysbench/control
@@ -1,3 +1,18 @@
+NAME = 'System Evaluation Benchmark'
+AUTHOR = 'Anton Blanchard <anton@samba.org>'
+TIME = 'MEDIUM'
+TEST_CLASS = 'IO'
+TEST_CATEGORY = 'Benchmark'
+TEST_TYPE = 'client'
+EXPERIMENTAL = 'True'
+
+DOC = """
+The idea is to quickly get an impression about system performance for MySQL
+usage without setting up complex benchmark and even without installing MySQL.
+In some cases this is very helpful. This is also the reason for having
+everything in simple file not depending on any external libraries.
+"""
+
 build = 1
 for threads in range(1, count_cpus()+1):
 	job.run_test('sysbench', db_type='pgsql', build=build, \
diff --git a/tbench/control b/tbench/control
index e85a10131..9652cf2e3 100644
--- a/tbench/control
+++ b/tbench/control
@@ -1 +1,19 @@
+NAME = 'TBench'
+AUTHOR = 'mbligh@google.com (Martin Bligh)'
+TIME = 'MEDIUM'
+TEST_CLASS = 'IO'
+TEST_CATEGORY = 'Benchmark'
+TEST_TYPE = 'client'
+EXPERIMENTAL = 'True'
+
+DOC = """
+tbench produces only the TCP and process load. It does the same socket
+calls that smbd would do under a netbench load. It does no filesystem
+calls. The idea behind tbench is to eliminate smbd from the netbench
+test, as though the smbd code could be made infinately fast. The
+throughput results of tbench tell us how fast a netbench run could go
+if we eliminated all filesystem IO and SMB packet processing.  tbench
+is built as part of the dbench package.
+"""
+
 job.run_test('tbench')
diff --git a/tiobench/control b/tiobench/control
index 7b0d460e7..a16d0d14c 100644
--- a/tiobench/control
+++ b/tiobench/control
@@ -1 +1,13 @@
+NAME = 'Threaded IO Bench'
+AUTHOR = 'walkinair@cn.ibm.com'
+TIME = 'MEDIUM'
+TEST_CLASS = 'IO'
+TEST_CATEGORY = 'Benchmark'
+TEST_TYPE = 'client'
+EXPERIMENTAL = 'True'
+
+DOC = """
+Performs threaded I/O benchmarks.
+"""
+
 job.run_test('tiobench', '/mnt')
diff --git a/tsc/control b/tsc/control
index f6f03a196..30478b720 100644
--- a/tsc/control
+++ b/tsc/control
@@ -1 +1,15 @@
+NAME = 'Check TSC'
+AUTHOR = 'Michael Davidson <md@google.com>'
+TIME = 'MEDIUM'
+TEST_CLASS = 'Kernel'
+TEST_CATEGORY = 'Functional'
+TEST_TYPE = 'client'
+EXPERIMENTAL = 'True'
+
+DOC = """
+checktsc is a user space program that checks TSC synchronization
+between pairs of CPUs on an SMP system using a technique borrowed
+from the Linux 2.6.18 kernel.
+"""
+
 job.run_test('tsc')
diff --git a/unixbench/control b/unixbench/control
index 5d6ba0281..ee46cba47 100644
--- a/unixbench/control
+++ b/unixbench/control
@@ -1 +1,13 @@
+NAME = 'Unix Bench'
+AUTHOR = 'adrianbg@google.com'
+TIME = 'MEDIUM'
+TEST_CLASS = 'Kernel'
+TEST_CATEGORY = 'Benchmark'
+TEST_TYPE = 'client'
+EXPERIMENTAL = 'False'
+
+DOC = """
+Performs the standard Unixbench suite of tests (v4.1).
+"""
+
 job.run_test('unixbench')
diff --git a/xmtest/control b/xmtest/control
index 98926273c..574b24eca 100644
--- a/xmtest/control
+++ b/xmtest/control
@@ -1 +1,13 @@
+NAME = 'Xen Test'
+AUTHOR = 'Paul Larson <pl@us.ibm.com>'
+TIME = 'MEDIUM'
+TEST_CLASS = 'Kernel'
+TEST_CATEGORY = 'Functional'
+TEST_TYPE = 'client'
+EXPERIMENTAL = 'True'
+
+DOC = """
+This suite provides a framework for testing the Xen userspace tools.
+"""
+
 job.run_test('xmtest', '-e nobody@nowhere.org -d xmtest')