Index: themes/seven/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/style.css,v
retrieving revision 1.39
diff -u -r1.39 style.css
--- themes/seven/style.css	4 Jan 2010 12:34:31 -0000	1.39
+++ themes/seven/style.css	7 Jan 2010 14:41:37 -0000
@@ -504,19 +504,18 @@
 /* Fieldsets & Form items */
 fieldset {
   border: 1px solid #ccc;
-  padding: 30px 13px 13px 14px;
+  padding: 0 13px 13px 14px;
   margin: 0 0 10px;
 }
 
-fieldset legend span,
-fieldset legend a {
-  position: absolute;
-  margin-top: 9px;
+fieldset div.seven-fieldset-wrapper {
+  margin-top: 30px;
+  display: block;
 }
 
-fieldset legend a span {
-  position: relative;
-  margin-top: 0;
+fieldset legend > * {
+  position: absolute;
+  margin-top: 9px;
 }
 
 fieldset.collapsed {
Index: themes/seven/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/template.php,v
retrieving revision 1.12
diff -u -r1.12 template.php
--- themes/seven/template.php	4 Jan 2010 03:46:31 -0000	1.12
+++ themes/seven/template.php	7 Jan 2010 14:41:37 -0000
@@ -82,6 +82,7 @@
   if (!empty($element['#title'])) {
     $output .= '<legend><span>' . $element['#title'] . '</span></legend>';
   }
+  $output .= '<div class="seven-fieldset-wrapper">';
   if (!empty($element['#description'])) {
     $output .= '<div class="fieldset-description">' . $element['#description'] . '</div>';
   }
@@ -89,7 +90,7 @@
   if (isset($element['#value'])) {
     $output .= $element['#value'];
   }
-  $output .= "</fieldset>\n";
+  $output .= "</div></fieldset>\n";
   return $output;
 }
 
Index: modules/simpletest/simpletest.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.test,v
retrieving revision 1.37
diff -u -r1.37 simpletest.test
--- modules/simpletest/simpletest.test	24 Dec 2009 08:03:53 -0000	1.37
+++ modules/simpletest/simpletest.test	7 Jan 2010 14:41:37 -0000
@@ -208,11 +208,11 @@
     if ($this->parse()) {
       if ($fieldset = $this->getResultFieldSet()) {
         // Code assumes this is the only test in group.
-        $results['summary'] = $this->asText($fieldset->div[1]);
+        $results['summary'] = $this->asText($fieldset->div->div[1]);
         $results['name'] = $this->asText($fieldset->legend);
 
         $results['assertions'] = array();
-        $tbody = $fieldset->table->tbody;
+        $tbody = $fieldset->div->table->tbody;
         foreach ($tbody->tr as $row) {
           $assertion = array();
           $assertion['message'] = $this->asText($row->td[0]);