diff --git a/core/modules/simpletest/simpletest.css b/core/modules/simpletest/simpletest.css
deleted file mode 100644
index 86bd04b..0000000
--- a/core/modules/simpletest/simpletest.css
+++ /dev/null
@@ -1,89 +0,0 @@
-
-/* Test Table */
-#simpletest-form-table th.select-all {
-  width: 1em;
-}
-th.simpletest_test {
-  width: 16em;
-}
-
-.simpletest-image {
-  display: inline-block;
-  cursor: pointer;
-  width: 1em;
-}
-.simpletest-group-label label {
-  display: inline;
-  font-weight: bold;
-}
-.simpletest-test-label label {
-  margin-left: 1em; /* LTR */
-}
-.simpletest-test-description .description {
-  margin: 0;
-}
-#simpletest-form-table tr td {
-  background-color: white;
-  color: #494949;
-}
-#simpletest-form-table tr.simpletest-group td {
-  background-color: #edf5fa;
-  color: #494949;
-}
-
-table#simpletest-form-table tr.simpletest-group label {
-  display: inline;
-}
-
-div.message > div.item-list {
-  font-weight: normal;
-}
-
-div.simpletest-pass {
-  color: #33a333;
-}
-.simpletest-fail {
-  color: #981010;
-}
-
-tr.simpletest-pass.odd {
-  background-color: #b6ffb6;
-}
-tr.simpletest-pass.even {
-  background-color: #9bff9b;
-}
-tr.simpletest-fail.odd {
-  background-color: #ffc9c9;
-}
-tr.simpletest-fail.even {
-  background-color: #ffacac;
-}
-tr.simpletest-exception.odd {
-  background-color: #f4ea71;
-}
-tr.simpletest-exception.even {
-  background-color: #f5e742;
-}
-tr.simpletest-debug.odd {
-  background-color: #eee;
-}
-tr.simpletest-debug.even {
-  background-color: #fff;
-}
-
-a.simpletest-collapse {
-  height: 0;
-  width: 0;
-  top: -99em;
-  position: absolute;
-}
-a.simpletest-collapse:focus,
-a.simpletest-collapse:hover {
-  font-size: 80%;
-  top: 0px;
-  height: auto;
-  width: auto;
-  overflow: visible;
-  position: relative;
-  z-index: 1000;
-}
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 5ad1b39..67b7866 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -160,7 +160,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') . '/simpletest.theme.css'),
     'init_message' => t('Processing test @num of @max - %test.', array('%test' => $info['name'], '@num' => '1', '@max' => count($test_list))),
   );
   batch_set($batch);
@@ -325,7 +325,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;
@@ -698,7 +698,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') . '/simpletest.theme.css' => array(),
     ),
     'dependencies' => array(
       array('system', 'jquery'),
diff --git a/core/modules/simpletest/simpletest.pages.inc b/core/modules/simpletest/simpletest.pages.inc
index 4fb908d..4212a7f 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')
+      )
+    ));
   }
 }
 
@@ -216,7 +223,7 @@ function simpletest_result_form($form, &$form_state, $test_id) {
   }
 
   // Load all classes and include CSS.
-  drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.css');
+  drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.theme.css');
 
   // Keep track of which test cases passed or failed.
   $filter = array(