diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 5ad1b39..eacc29a 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -84,10 +84,6 @@ function simpletest_theme() {
       'render element' => 'table',
       'file' => 'simpletest.pages.inc',
     ),
-    'simpletest_result_summary' => array(
-      'render element' => 'form',
-      'file' => 'simpletest.pages.inc',
-    ),
   );
 }
 
diff --git a/core/modules/simpletest/simpletest.pages.inc b/core/modules/simpletest/simpletest.pages.inc
index 4fb908d..c0bc66f 100644
--- a/core/modules/simpletest/simpletest.pages.inc
+++ b/core/modules/simpletest/simpletest.pages.inc
@@ -230,7 +230,6 @@ function simpletest_result_form($form, &$form_state, $test_id) {
     '#title' => t('Results'),
   );
   $form['result']['summary'] = $summary = array(
-    '#theme' => 'simpletest_result_summary',
     '#pass' => 0,
     '#fail' => 0,
     '#exception' => 0,
@@ -285,6 +284,13 @@ function simpletest_result_form($form, &$form_state, $test_id) {
 
     // Store test group (class) as for use in filter.
     $filter[$group_summary['#ok'] ? 'pass' : 'fail'][] = $group;
+
+    // Render summary information.
+    $group_summary += array(
+      '#prefix' => '<div class="simpletest-' . ($group_summary['#ok'] ? 'pass' : 'fail') . '">',
+      '#markup' => _simpletest_format_summary_line($group_summary),
+      '#suffix' => '</div>',
+    );
   }
 
   // Overal summary status.
@@ -331,6 +337,13 @@ function simpletest_result_form($form, &$form_state, $test_id) {
     '#href' => 'admin/config/development/testing',
   );
 
+  // Render overall summary.
+  $form['result']['summary'] += array(
+    '#prefix' => '<div class="simpletest-' . ($form['result']['summary']['#ok'] ? 'pass' : 'fail') . '">',
+    '#markup' => _simpletest_format_summary_line($form['result']['summary']),
+    '#suffix' => '</div>',
+  );
+
   if (is_numeric($test_id)) {
     simpletest_clean_results_table($test_id);
   }
@@ -370,20 +383,6 @@ function simpletest_result_form_submit($form, &$form_state) {
 }
 
 /**
- * Returns HTML for the summary status of a simpletest result.
- *
- * @param $variables
- *   An associative array containing:
- *   - form: A render element representing the form.
- *
- * @ingroup themeable
- */
-function theme_simpletest_result_summary($variables) {
-  $form = $variables['form'];
-  return '<div class="simpletest-' . ($form['#ok'] ? 'pass' : 'fail') . '">' . _simpletest_format_summary_line($form) . '</div>';
-}
-
-/**
  * Get test results for $test_id.
  *
  * @param $test_id The test_id to retrieve results of.