diff --git a/lib.php b/lib.php
index ff7c173..5f4a9c4 100644
--- a/lib.php
+++ b/lib.php
@@ -52,7 +52,7 @@ function block_grade_me_query_prefix() {
  */
 function block_grade_me_query_suffix($mod) {
     $query = " AND bgm.courseid = ?
- AND bgm.itemmodule = '$mod'";
+ AND bgm.itemmodule = '$mod' ORDER BY submissionid ASC";
     return $query;
 }
 
diff --git a/tests/grade_me_test.php b/tests/grade_me_test.php
index 011da68..20c0e97 100644
--- a/tests/grade_me_test.php
+++ b/tests/grade_me_test.php
@@ -275,7 +275,7 @@ public function test_query_prefix() {
      */
     public function test_query_suffix() {
         $expected = " AND bgm.courseid = ?
- AND bgm.itemmodule = 'assign'";
+ AND bgm.itemmodule = 'assign' ORDER BY submissionid ASC";
         $this->assertEquals($expected, block_grade_me_query_suffix('assign'));
     }
 
@@ -357,8 +357,7 @@ public function test_query_quiz($datafile, $expected) {
         $this->update_quiz_ngrade();
 
         list($sql, $params) = block_grade_me_query_quiz(array($users[0]->id));
-        $sql = block_grade_me_query_prefix().$sql.block_grade_me_query_suffix('quiz') .
-            ' ORDER BY submissionid ASC';
+        $sql = block_grade_me_query_prefix().$sql.block_grade_me_query_suffix('quiz');
 
         $actual = array();
         $result = $DB->get_recordset_sql($sql, array($params[0], $courses[0]->id));
@@ -508,8 +507,7 @@ public function standard_query_tests($datafile, $expected, $suffix) {
 
         $dbfunction = 'block_grade_me_query_'.$suffix;
         list($sql, $params) = $dbfunction(array($users[0]->id));
-        $sql = block_grade_me_query_prefix().$sql.block_grade_me_query_suffix($suffix) .
-            ' ORDER BY submissionid ASC';
+        $sql = block_grade_me_query_prefix().$sql.block_grade_me_query_suffix($suffix);
 
         $actual = array();
         $result = $DB->get_recordset_sql($sql, array($params[0], $courses[0]->id));