diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index cc6f6e650cf..edcc3e4713b 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -571,14 +571,7 @@ function quiz_process_options(&$quiz) {
         $quiz->preventlate = 0;
     }
 
-    // Quiz name. (Make up a default if one was not given.)
-    if (empty($quiz->name)) {
-        if (empty($quiz->intro)) {
-            $quiz->name = get_string('modulename', 'quiz');
-        } else {
-            $quiz->name = shorten_text(strip_tags($quiz->intro));
-        }
-    }
+    // Quiz name (now a required field).
     $quiz->name = trim($quiz->name);
 
     // Time limit. (Get rid of it if the checkbox was not ticked.)
diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index b197e37462b..588ca573ea5 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -16,6 +16,7 @@ class mod_quiz_mod_form extends moodleform_mod {
 
         $mform->addElement('text', 'name', get_string('name'), array('size'=>'64'));
         $mform->setType('name', PARAM_TEXT);
+        $mform->addRule('name', null, 'required', null, 'client');
 
         $mform->addElement('htmleditor', 'intro', get_string("introduction", "quiz"));
         $mform->setType('intro', PARAM_RAW);