diff --git a/mod/lesson/import.php b/mod/lesson/import.php
index a3d22818f36..38d5c0f73be 100644
--- a/mod/lesson/import.php
+++ b/mod/lesson/import.php
@@ -66,9 +66,7 @@ if ($data = $mform->get_data()) {
     require_sesskey();
 
     $realfilename = $mform->get_new_filename('questionfile');
-    //TODO: Leave all imported questions in Questionimport for now.
-    $importfile = "{$CFG->tempdir}/questionimport/{$realfilename}";
-    make_temp_directory('questionimport');
+    $importfile = make_request_directory() . "/{$realfilename}";
     if (!$result = $mform->save_file('questionfile', $importfile, true)) {
         throw new moodle_exception('uploadproblem');
     }
diff --git a/question/import.php b/question/import.php
index 0f68d1ee684..567fb741353 100644
--- a/question/import.php
+++ b/question/import.php
@@ -86,9 +86,7 @@ if ($form = $import_form->get_data()) {
     // work out if this is an uploaded file
     // or one from the filesarea.
     $realfilename = $import_form->get_new_filename('newfile');
-
-    $importfile = "{$CFG->tempdir}/questionimport/{$realfilename}";
-    make_temp_directory('questionimport');
+    $importfile = make_request_directory() . "/{$realfilename}";
     if (!$result = $import_form->save_file('newfile', $importfile, true)) {
         throw new moodle_exception('uploadproblem');
     }