diff --git a/aborttest/control b/aborttest/control
index 2e9548fed..f97cfcab8 100644
--- a/aborttest/control
+++ b/aborttest/control
@@ -1,11 +1,14 @@
-AUTHOR = "Autotest Team"
+AUTHOR = "Martin Bligh <mbligh@google.com>"
+EXPERIMENTAL = 'True'  # Not really, but this is only for testing autotest...
+                       # not testing _with_ autotest.
 NAME = "Abort test"
 TEST_TYPE = "client"
 TEST_CLASS = "General"
 TEST_CATEGORY = "Functional"
 TIME = "SHORT"
 DOC = """\
-Raise a JobError to simulate a test aborting
+Raise a JobError to simulate a test aborting.  This is for testing Autotest
+itself.
 """
 
 job.run_test('aborttest')
diff --git a/aio_dio_bugs/control b/aio_dio_bugs/control
index d9bc9e7ae..57d26d42c 100644
--- a/aio_dio_bugs/control
+++ b/aio_dio_bugs/control
@@ -1,5 +1,5 @@
 NAME = "aio dio bugs"
-AUTHOR = "Autotest Team"
+AUTHOR = "Rafal Wijata <wijata@nec-labs.com>"
 TEST_TYPE = "client"
 TEST_CLASS = "Kernel"
 TEST_CATEGORY = "Functional"
diff --git a/aiostress/control b/aiostress/control
index cd0fc13d5..c59c1c945 100644
--- a/aiostress/control
+++ b/aiostress/control
@@ -1,4 +1,4 @@
-AUTHOR = "Autotest Team"
+AUTHOR = "Masoud S <masouds@google.com>"
 NAME = "aio stress"
 TEST_CATEGORY = "Stress"
 TEST_CLASS = "Kernel"
@@ -16,4 +16,5 @@ to reads
 
 io buffers are aligned in case you want to do raw io
 """
+
 job.run_test('aiostress')
diff --git a/barriertest/control b/barriertest/control
index da594bf80..2f14f3100 100644
--- a/barriertest/control
+++ b/barriertest/control
@@ -1,9 +1,14 @@
-AUTHOR = "Autotest Team"
+AUTHOR = "Colby Ranger <cranger@google.com>"
+EXPERIMENTAL = 'True'  # This isn't actually experimental, but it only tests
+                       # autotest itself.
 TIME = "MEDIUM"
 NAME = "Barrier Test"
 TEST_TYPE = "client"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "Stress"
 DOC = """\
-Stub information needs to be updated!
+This tests barriers which can be used for multiple threads/processes/hosts
+to coordinate within a test.  This is for testing Autotest itself.
 """
+
+job.run_test('barriertest')
diff --git a/bash_shared_mapping/control b/bash_shared_mapping/control
index e1a75c7bb..959a987b9 100644
--- a/bash_shared_mapping/control
+++ b/bash_shared_mapping/control
@@ -1 +1,12 @@
+AUTHOR = "Martin Bligh <mbligh@google.com>"
+EXPERIMENTAL = 'True'  # Change if you use this and it works.  :-)
+NAME = "bash shared mapping"
+TIME = "SHORT"
+TEST_CLASS = "Kernel"
+TEST_CATEGORY = "Functional"
+TEST_TYPE = "client"
+DOC = """\
+Who knows...
+"""
+
 job.run_test('bash_shared_mapping')
diff --git a/bonnie/control b/bonnie/control
index 88329baaa..16998277d 100644
--- a/bonnie/control
+++ b/bonnie/control
@@ -1 +1,15 @@
+AUTHOR = "Martin Bligh <mbligh@google.com>"
+NAME = "bonnie"
+TIME = "MEDIUM"
+TEST_CLASS = "Kernel"
+TEST_CATEGORY = "Functional"
+TEST_TYPE = "client"
+DOC = """\
+Bonnie is a benchmark which measures the performance of Unix file system
+operations. Bonnie is concerned with identifying bottlenecks; the name is a
+tribute to Bonnie Raitt, who knows how to use one.
+
+For more info, see http://www.textuality.com/bonnie/
+"""
+
 job.run_test('bonnie')
diff --git a/btreplay/control b/btreplay/control
index 98519a907..0e2a8e0ed 100644
--- a/btreplay/control
+++ b/btreplay/control
@@ -1 +1,20 @@
+AUTHOR = "Joshua Root <jmr@gelato.unsw.edu.au>"
+EXPERIMENTAL = 'True'  # Change if you use this and it works.  :-)
+NAME = "btreplay"
+TIME = "short"
+TEST_CLASS = "Kernel"
+TEST_CATEGORY = "Functional"
+TEST_TYPE = "client"
+DOC = """\
+Here's a test that takes a trace produced by blktrace, and uses btreplay
+to replay it against a device. Output consists of wall clock time,
+system time, and average request completion latency.
+
+A spare device or partition is required for the test to trash. If this
+is unacceptable, it can easily be changed to be read-only by default.
+
+The trick, of course, will be choosing one or more traces that are
+generally "interesting enough" to include.
+"""
+
 job.run_test('btreplay')