diff --git a/classes/output/renderer.php b/classes/output/renderer.php
index 85497f8a..a35cdb94 100755
--- a/classes/output/renderer.php
+++ b/classes/output/renderer.php
@@ -244,7 +244,8 @@ public function question_output($question, $response, $qnum, $blankquestionnaire
                 $pagetags->notifications = $this->notification($notification, \core\output\notification::NOTIFY_ERROR);
             }
         }
-
+        $pagetags->questionname = $question->name;
+        
         return $this->render_from_template('mod_questionnaire/question_container', $pagetags);
     }
 
diff --git a/templates/question_container.mustache b/templates/question_container.mustache
index f29c93ac..97ebd1a9 100644
--- a/templates/question_container.mustache
+++ b/templates/question_container.mustache
@@ -58,7 +58,7 @@
             {{{required}}}
         </div>
     {{/qnum}}
-    <div class="qn-content">
+    <div class="qn-content" {{#questionname}}data-question-name="{{questionname}}"{{/questionname}}>
         <div class="qn-question {{skippedclass}}">
             {{#label}}<label for="{{label.for}}">{{/label}}
             {{{qcontent}}}