diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
index 3156a3e45dd..e158b8cace4 100644
--- a/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@ -447,6 +447,10 @@ class page_requirements_manager {
      * @param bool $inhead initialise in head
      */
     public function js($url, $inhead = false) {
+        if ($url == '/question/qengine.js') {
+            debugging('The question/qengine.js has been deprecated. ' .
+                'Please use core_question/question_engine', DEBUG_DEVELOPER);
+        }
         $url = $this->js_fix_url($url);
         $where = $inhead ? 'head' : 'footer';
         $this->jsincludes[$where][$url->out()] = $url;
diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 2f7547d2a68..72328c8601b 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -201,7 +201,7 @@ for ($pageiter = 1; $pageiter <= $numberoflisteners; $pageiter++) {
 }
 
 $PAGE->requires->data_for_js('quiz_edit_config', $quizeditconfig);
-$PAGE->requires->js('/question/qengine.js');
+$PAGE->requires->js_call_amd('core_question/question_engine');
 
 // Questions wrapper start.
 echo html_writer::start_tag('div', ['class' => 'mod-quiz-edit-content']);