diff --git modules/simpletest/simpletest.test modules/simpletest/simpletest.test
index a6f73b7..8fc3cc9 100644
--- modules/simpletest/simpletest.test
+++ modules/simpletest/simpletest.test
@@ -208,11 +208,11 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase {
     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]);
diff --git themes/seven/style.css themes/seven/style.css
index b97bff3..6e85c12 100644
--- themes/seven/style.css
+++ themes/seven/style.css
@@ -504,18 +504,24 @@ table tr.selected td {
 /* Fieldsets & Form items */
 fieldset {
   border: 1px solid #ccc;
-  padding: 30px 13px 13px 14px;
+  padding: 0 13px 13px 14px;
   margin: 0 0 10px;
 }
 
+fieldset div.fieldset-inner {
+  margin-top: 30px;
+  display: block;
+}
+
 fieldset legend span,
 fieldset legend a {
   position: absolute;
   margin-top: 9px;
 }
 
+fieldset legend span a,
 fieldset legend a span {
-  position: relative;
+  position: static;
   margin-top: 0;
 }
 
diff --git themes/seven/template.php themes/seven/template.php
index 97ae3e0..5a0eba6 100644
--- themes/seven/template.php
+++ themes/seven/template.php
@@ -82,6 +82,7 @@ function seven_fieldset($variables) {
   if (!empty($element['#title'])) {
     $output .= '<legend><span>' . $element['#title'] . '</span></legend>';
   }
+  $output .= '<div class="fieldset-inner">';
   if (!empty($element['#description'])) {
     $output .= '<div class="fieldset-description">' . $element['#description'] . '</div>';
   }
@@ -89,7 +90,7 @@ function seven_fieldset($variables) {
   if (isset($element['#value'])) {
     $output .= $element['#value'];
   }
-  $output .= "</fieldset>\n";
+  $output .= "</div></fieldset>\n";
   return $output;
 }