diff --git a/question/type/description/question.html b/question/type/description/question.html
index 3b7bb048e9da3..83edbc24f7821 100644
--- a/question/type/description/question.html
+++ b/question/type/description/question.html
@@ -1,4 +1,4 @@
-<table id="q<?php echo $question->id; ?>" class="que <?php echo $question->qtype; ?>"><tr><td>
+<div id="q<?php echo $question->id; ?>" class="que <?php echo $question->qtype; ?>">
   <div class="info">
     <span class="edit"><?php echo $editlink; ?></span>
   </div>
@@ -11,4 +11,4 @@
       <img class="qimage" src="<?php echo $image; ?>" alt="" />
     <?php } ?>
   </div>
-</td></tr></table>
+</div>
diff --git a/question/type/question.html b/question/type/question.html
index 0b9649f9bf0e3..cbeca13fa825b 100644
--- a/question/type/question.html
+++ b/question/type/question.html
@@ -3,7 +3,7 @@
  * print_question() method.
  */
 ?>
-<table id="q<?php echo $question->id; ?>" class="que <?php echo $question->qtype; ?>"><tr><td>
+<div id="q<?php echo $question->id; ?>" class="que <?php echo $question->qtype; ?>">
   <div class="info">
     <span class="no"><?php echo $number; ?></span>
     <?php if ($editlink) { ?>
@@ -29,4 +29,4 @@
       ?>
 	</div>
   <?php } ?>
-</td></tr></table>
+</div>