diff --git a/grade/import/csv/classes/load_data.php b/grade/import/csv/classes/load_data.php
index bc7ad65d462..cfe472dc8de 100644
--- a/grade/import/csv/classes/load_data.php
+++ b/grade/import/csv/classes/load_data.php
@@ -476,8 +476,8 @@ class gradeimport_csv_load_data {
         // Check for mapto collisions.
         $maperrors = array();
         foreach ($map as $i => $j) {
-            if ($j == 0) {
-                // You can have multiple ignores.
+            if (($j == 0) || ($j == 'new')) {
+                // You can have multiple ignores or multiple new grade items.
                 continue;
             } else {
                 if (!isset($maperrors[$j])) {
diff --git a/grade/tests/behat/grade_import.feature b/grade/tests/behat/grade_import.feature
index a5ea6f6feb3..2aa019a2078 100644
--- a/grade/tests/behat/grade_import.feature
+++ b/grade/tests/behat/grade_import.feature
@@ -21,20 +21,19 @@ Feature: An admin can import grades into gradebook using a CSV file
       | student2 | C1     | student        |
       | student3 | C1     | student        |
     And the following "grade item" exists:
-      | course         | C1            |
-      | itemname       | Manual item 1 |
-      | grademin       | 10            |
-      | grademax       | 500           |
+      | course   | C1            |
+      | itemname | Manual item 1 |
+      | grademin | 10            |
+      | grademax | 500           |
     And the following "grade grades" exist:
       | gradeitem     | user     | grade |
       | Manual item 1 | student1 | 50.00 |
       | Manual item 1 | student2 | 50.00 |
       | Manual item 1 | student3 | 50.00 |
 
-  @javascript
   Scenario: Max grade of grade item is respected when importing grades
     Given I am on the "Course 1" "Course" page logged in as "teacher1"
-    And I navigate to "More > Import" in the course gradebook
+    And I navigate to "CSV file" import page in the course gradebook
     And I upload "grade/tests/fixtures/grade_import_grademax.csv" file to "File" filemanager
     And I click on "Upload grades" "button"
     And I set the field "Map from" to "Email address"
@@ -62,7 +61,28 @@ Feature: An admin can import grades into gradebook using a CSV file
     And I should see "Grade import success"
     And I click on "Continue" "button"
     Then the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-       | -4-       |
-      | Student 1          | student1@example.com | 400.00    | 400.00    |
-      | Student 2          | student2@example.com |  50.00    |  50.00    |
-      | Student 3          | student3@example.com |  50.00    |  50.00    |
+      | -1-                | -1-                  | -3-    | -4-    |
+      | Student 1          | student1@example.com | 400.00 | 400.00 |
+      | Student 2          | student2@example.com | 50.00  | 50.00  |
+      | Student 3          | student3@example.com | 50.00  | 50.00  |
+
+  Scenario: Importing grades with multiple new mappings
+    Given I am on the "Course 1" "Course" page logged in as "teacher1"
+    And I navigate to "CSV file" import page in the course gradebook
+    And I upload "grade/tests/fixtures/grade_import_multiple_mappings.csv" file to "File" filemanager
+    And I click on "Upload grades" "button"
+    And I set the following fields to these values:
+      | Map from | Email address  |
+      | Map to   | Email address  |
+      | Grade A  | New grade item |
+      | Grade B  | New grade item |
+      | Grade C  | New grade item |
+      | Grade D  | New grade item |
+    And I click on "Upload grades" "button"
+    And I should see "Grade import success"
+    And I click on "Continue" "button"
+    Then the following should exist in the "user-grades" table:
+      | -1-       | -1-                  | -3-   | -4-   | -5-   | -6-   | -7-   | -8-    |
+      | Student 1 | student1@example.com | 50.00 | 11.00 | 12.00 | 13.00 | 14.00 | 100.00 |
+      | Student 2 | student2@example.com | 50.00 | 21.00 | 22.00 | 23.00 | 24.00 | 140.00 |
+      | Student 3 | student3@example.com | 50.00 | 31.00 | 32.00 | 33.00 | 34.00 | 180.00 |
diff --git a/grade/tests/fixtures/grade_import_multiple_mappings.csv b/grade/tests/fixtures/grade_import_multiple_mappings.csv
new file mode 100644
index 00000000000..6b8a584cd17
--- /dev/null
+++ b/grade/tests/fixtures/grade_import_multiple_mappings.csv
@@ -0,0 +1,4 @@
+First name,Last name,Email address,Grade A,Grade B,Grade C,Grade D
+Student,1,student1@example.com,11,12,13,14
+Student,2,student2@example.com,21,22,23,24
+Student,3,student3@example.com,31,32,33,34