diff --git a/tests/css_cache.test b/tests/css_cache.test
index 774d3dc..a2b8885 100644
--- a/tests/css_cache.test
+++ b/tests/css_cache.test
@@ -10,7 +10,7 @@ class CtoolsCSSObjectCache extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'CTools CSS cache',
+      'name' => 'CSS cache',
       'description' => 'Tests the custom CSS cache handler.',
       'group' => 'ctools',
     );
diff --git a/tests/ctools_export_test/ctools_export.test b/tests/ctools_export_test/ctools_export.test
index baec2cd..c826d3b 100644
--- a/tests/ctools_export_test/ctools_export.test
+++ b/tests/ctools_export_test/ctools_export.test
@@ -10,7 +10,7 @@ class CtoolsExportCrudTestCase extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'CTools export CRUD tests',
+      'name' => 'Export CRUD',
       'description' => 'Test the CRUD functionality for the ctools export system.',
       'group' => 'ctools',
     );
diff --git a/tests/math_expression.test b/tests/math_expression.test
index 143b409..7da55fc 100644
--- a/tests/math_expression.test
+++ b/tests/math_expression.test
@@ -10,7 +10,7 @@ class CtoolsMathExpressionTestCase extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'CTools math expression tests',
+      'name' => 'Math expressions',
       'description' => 'Test the math expression library of ctools.',
       'group' => 'ctools',
     );
diff --git a/tests/math_expression_stack.test b/tests/math_expression_stack.test
index 8a06d89..7564781 100644
--- a/tests/math_expression_stack.test
+++ b/tests/math_expression_stack.test
@@ -10,7 +10,7 @@ class CtoolsMathExpressionStackTestCase extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'CTools math expression stack tests',
+      'name' => 'Math expressions stack',
       'description' => 'Test the stack class of the math expression library.',
       'group' => 'ctools',
     );
diff --git a/tests/object_cache.test b/tests/object_cache.test
index 473df80..47aaa0d 100644
--- a/tests/object_cache.test
+++ b/tests/object_cache.test
@@ -10,7 +10,7 @@ class CtoolsObjectCache extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'CTools object cache storage',
+      'name' => 'Object cache storage (UI tests)',
       'description' => 'Verify that objects are written, readable and lockable.',
       'group' => 'ctools',
     );
diff --git a/tests/object_cache_unit.test b/tests/object_cache_unit.test
index e1339d2..a20a8a8 100644
--- a/tests/object_cache_unit.test
+++ b/tests/object_cache_unit.test
@@ -10,7 +10,7 @@ class CtoolsUnitObjectCachePlugins extends DrupalUnitTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'CTools Unit object cache storage',
+      'name' => 'Object cache storage (unit tests)',
       'description' => 'Verify that objects are written, readable and lockable.',
       'group' => 'ctools',
     );
diff --git a/tests/page_tokens.test b/tests/page_tokens.test
index 92f4607..c62adc3 100644
--- a/tests/page_tokens.test
+++ b/tests/page_tokens.test
@@ -16,7 +16,7 @@ class CtoolsPageTokens extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'CTools Unit page token processing',
+      'name' => 'Page token processing',
       'description' => 'Verify that page tokens can be set and read.',
       'group' => 'ctools',
     );
diff --git a/tests/uuid_with_uuid.test b/tests/uuid_with_uuid.test
index 063a855..af836f4 100644
--- a/tests/uuid_with_uuid.test
+++ b/tests/uuid_with_uuid.test
@@ -10,7 +10,7 @@ class CtoolsUUIDWithUUID extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'CTools tests for UUID (with UUID module)',
+      'name' => 'UUID handing, with UUID module',
       'description' => 'Check that the CTools UUID functions behave correctly when the UUID module is installed.',
       'group' => 'ctools',
       // 'dependencies' => array('ctools', 'uuid'),
@@ -32,6 +32,8 @@ function setUp(array $modules = array()) {
    *
    * NB: This test will use one (and only one) of the mechanisms available
    * from pear,
+   *
+   * @todo Fix this so testbot doesn't fail.
    */
   public function DISABLED_testMakeNewUUID() {
     // drupal_get_filename will report even if the module is disabled.
diff --git a/tests/uuid_without_uuid.test b/tests/uuid_without_uuid.test
index 5dbcc9f..222ad0b 100644
--- a/tests/uuid_without_uuid.test
+++ b/tests/uuid_without_uuid.test
@@ -10,7 +10,7 @@ class CtoolsUUIDWithoutUUID extends DrupalWebTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'CTools tests for UUID (without UUID module)',
+      'name' => 'UUID handing, without UUID module',
       'description' => 'Check that the CTools UUID functions behave correctly when the UUID module is not installed.',
       'group' => 'ctools',
     );
@@ -26,6 +26,8 @@ function setUp(array $modules = array()) {
 
   /**
    * Check the UUID_PATTERN constant exists.
+   *
+   * @todo Fix this so testbot doesn't fail.
    */
   public function DISABLED_testHaveUUIDpattern() {
     ctools_include('uuid');
@@ -38,6 +40,8 @@ public function DISABLED_testHaveUUIDpattern() {
    *
    * NB: This test will use one (and only one) of the mechanisms available
    * from pear,
+   *
+   * @todo Fix this so testbot doesn't fail.
    */
   public function DISABLED_testMakeNewUUIDRaw() {
     // drupal_get_filename will report even if the module is disabled.
@@ -55,6 +59,8 @@ public function DISABLED_testMakeNewUUIDRaw() {
    *
    * NB: This test will use one (and only one) of the mechanisms available
    * from pear,
+   *
+   * @todo Fix this so testbot doesn't fail.
    */
   public function DISABLED_testMakeNewUUIDWrapper() {
     // drupal_get_filename will report even if the module is disabled.
@@ -68,6 +74,8 @@ public function DISABLED_testMakeNewUUIDWrapper() {
 
   /**
    * Check we can verify that a string looks like a UUID.
+   *
+   * @todo Fix this so testbot doesn't fail.
    */
   public function DISABLED_testVerifyUUID() {
     $checks = array(