diff --git a/mod/quiz/index.php b/mod/quiz/index.php
index aa278d6a754..c3049646e49 100644
--- a/mod/quiz/index.php
+++ b/mod/quiz/index.php
@@ -24,10 +24,10 @@
     if (has_capability('moodle/question:manage', $coursecontext)) {
         $streditquestions =
                 "<form target=\"_parent\" method=\"get\" action=\"$CFG->wwwroot/question/edit.php\">
-                   <fieldset class=\"invisiblefieldset\">
+                   <div>
                    <input type=\"hidden\" name=\"courseid\" value=\"$course->id\" />
                    <input type=\"submit\" value=\"".get_string("editquestions", "quiz")."\" />
-                   </fieldset>
+                   </div>
                  </form>";
     }
     print_header_simple($strquizzes, '', $strquizzes,
diff --git a/mod/quiz/jstimer.php b/mod/quiz/jstimer.php
index 31ca9ce35b5..2785f35c0e7 100644
--- a/mod/quiz/jstimer.php
+++ b/mod/quiz/jstimer.php
@@ -32,9 +32,9 @@ var ec_quiz_finish = ec_page_start + <?php echo ($timerstartvalue * 1000); ?>;
     </tr>
     <tr>
         <td id="QuizTimer" class="generaltablecell" align="center" width="100%">
-        <form id="clock"><fieldset class="invisiblefieldset"><input onfocus="blur()" type="text" id="time"
+        <form id="clock"><div><input onfocus="blur()" type="text" id="time"
         style="background-color: transparent; border: none; width: 70%; font-family: sans-serif; font-size: 14pt; font-weight: bold; text-align: center;" />
-        </fieldset>
+        </div>
         </form>
         </td>
     </tr>
diff --git a/mod/quiz/pagelib.php b/mod/quiz/pagelib.php
index 8f2fe2c8287..16bdad19eeb 100644
--- a/mod/quiz/pagelib.php
+++ b/mod/quiz/pagelib.php
@@ -68,11 +68,11 @@ class page_quiz extends page_generic_activity {
                update_module_button($this->modulerecord->id, $this->courserecord->id, get_string('modulename', 'quiz')).'</td>';
             if(!empty($CFG->showblocksonmodpages)) {
                 $buttons .= '<td><form '.$CFG->frametarget.' method="get" action="view.php">'.
-                    '<fieldset class="invisiblefieldset">'.
+                    '<div>'.
                     '<input type="hidden" name="id" value="'.$this->modulerecord->id.'" />'.
                     '<input type="hidden" name="edit" value="'.($this->user_is_editing()?'off':'on').'" />'.
                     '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" />'.
-                    '</fieldset></form></td>';
+                    '</div></form></td>';
             }
             $buttons .= '</tr></table>';
         }