diff --git a/core/modules/simpletest/simpletest.css b/core/modules/simpletest/css/simpletest.admin.css
similarity index 69%
rename from core/modules/simpletest/simpletest.css
rename to core/modules/simpletest/css/simpletest.admin.css
index 86bd04b..a13a9db 100644
--- a/core/modules/simpletest/simpletest.css
+++ b/core/modules/simpletest/css/simpletest.admin.css
@@ -1,8 +1,5 @@
 
 /* Test Table */
-#simpletest-form-table th.select-all {
-  width: 1em;
-}
 th.simpletest_test {
   width: 16em;
 }
@@ -22,52 +19,52 @@ th.simpletest_test {
 .simpletest-test-description .description {
   margin: 0;
 }
-#simpletest-form-table tr td {
+.simpletest-form-table td {
   background-color: white;
   color: #494949;
 }
-#simpletest-form-table tr.simpletest-group td {
+.simpletest-form-table .simpletest-group td {
   background-color: #edf5fa;
   color: #494949;
 }
 
-table#simpletest-form-table tr.simpletest-group label {
+.simpletest-form-table .simpletest-group label {
   display: inline;
 }
 
-div.message > div.item-list {
+.simpletest-verbose-message {
   font-weight: normal;
 }
 
-div.simpletest-pass {
+.simpletest-pass {
   color: #33a333;
 }
 .simpletest-fail {
   color: #981010;
 }
 
-tr.simpletest-pass.odd {
+.simpletest-pass.odd {
   background-color: #b6ffb6;
 }
-tr.simpletest-pass.even {
+.simpletest-pass.even {
   background-color: #9bff9b;
 }
-tr.simpletest-fail.odd {
+.simpletest-fail.odd {
   background-color: #ffc9c9;
 }
-tr.simpletest-fail.even {
+.simpletest-fail.even {
   background-color: #ffacac;
 }
-tr.simpletest-exception.odd {
+.simpletest-exception.odd {
   background-color: #f4ea71;
 }
-tr.simpletest-exception.even {
+.simpletest-exception.even {
   background-color: #f5e742;
 }
-tr.simpletest-debug.odd {
+.simpletest-debug.odd {
   background-color: #eee;
 }
-tr.simpletest-debug.even {
+.simpletest-debug.even {
   background-color: #fff;
 }
 
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 97caa11..de5db5f 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -157,7 +157,7 @@ function simpletest_run_tests($test_list, $reporter = 'drupal') {
     ),
     'finished' => '_simpletest_batch_finished',
     'progress_message' => '',
-    'css' => array(drupal_get_path('module', 'simpletest') . '/simpletest.css'),
+    'css' => array(drupal_get_path('module', 'simpletest') . '/css/simpletest.admin.css'),
     'init_message' => t('Processing test @num of @max - %test.', array('%test' => $info['name'], '@num' => '1', '@max' => count($test_list))),
   );
   batch_set($batch);
@@ -322,7 +322,7 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
   }
   $context['message'] = t('Processed test @num of @max - %test.', array('%test' => $info['name'], '@num' => $max - $size, '@max' => $max));
   $context['message'] .= '<div class="simpletest-' . ($test_results['#fail'] + $test_results['#exception'] ? 'fail' : 'pass') . '">Overall results: ' . _simpletest_format_summary_line($test_results) . '</div>';
-  $context['message'] .= theme('item_list', array('items' => $items));
+  $context['message'] .= theme('item_list', array('items' => $items, 'attributes' => array('class' => array('simpletest-verbose-message'))));
 
   // Save working values for the next iteration.
   $context['sandbox']['tests'] = $test_list;
@@ -695,7 +695,7 @@ function simpletest_library_info() {
       drupal_get_path('module', 'simpletest') . '/simpletest.js' => array(),
     ),
     'css' => array(
-      drupal_get_path('module', 'simpletest') . '/simpletest.css' => array(),
+      drupal_get_path('module', 'simpletest') . '/css/simpletest.admin.css' => array(),
     ),
     'dependencies' => array(
       array('system', 'jquery'),
diff --git a/core/modules/simpletest/simpletest.pages.inc b/core/modules/simpletest/simpletest.pages.inc
index 99f242b..ad1d275 100644
--- a/core/modules/simpletest/simpletest.pages.inc
+++ b/core/modules/simpletest/simpletest.pages.inc
@@ -172,7 +172,14 @@ function theme_simpletest_test_table($variables) {
     return '<strong>' . t('No tests to display.') . '</strong>';
   }
   else {
-    return theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'simpletest-form-table')));
+    return theme('table', array(
+      'header' => $header,
+      'rows' => $rows,
+      'attributes' => array(
+        'id' => 'simpletest-form-table',
+        'class' => array('simpletest-form-table'),
+      )
+    ));
   }
 }