diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php
index bc50a865ed6..42b1434a0a1 100644
--- a/mod/quiz/renderer.php
+++ b/mod/quiz/renderer.php
@@ -1083,14 +1083,13 @@ class mod_quiz_renderer extends plugin_renderer_base {
         }
         if ($viewobj->gradebookfeedback) {
             $resultinfo .= $this->heading(get_string('comment', 'quiz'), 3, 'main');
-            $resultinfo .= '<p class="quizteacherfeedback">'.$viewobj->gradebookfeedback.
-                    "</p>\n";
+            $resultinfo .= html_writer::div($viewobj->gradebookfeedback, 'quizteacherfeedback') . "\n";
         }
         if ($viewobj->feedbackcolumn) {
             $resultinfo .= $this->heading(get_string('overallfeedback', 'quiz'), 3, 'main');
-            $resultinfo .= html_writer::tag('p',
+            $resultinfo .= html_writer::div(
                     quiz_feedback_for_grade($viewobj->mygrade, $quiz, $context),
-                    array('class' => 'quizgradefeedback'))."\n";
+                    'quizgradefeedback') . "\n";
         }
 
         if ($resultinfo) {