diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
index b4cc0aba912..feb37ce6868 100644
--- a/grade/report/user/lib.php
+++ b/grade/report/user/lib.php
@@ -751,8 +751,9 @@ class grade_report_user extends grade_report {
                         $parent = false;
                     }
                 } while ($parent);
-                // Finally multiply by the course grademax.
-                $gradeval *= $this->aggregationhints[$itemid]['grademax'];
+
+                // Convert to percent.
+                $gradeval *= 100;
 
                 // Now we need to loop through the "built" table data and update the
                 // contributions column for the current row.
@@ -761,7 +762,7 @@ class grade_report_user extends grade_report {
                     if (isset($row['itemname']) && ($row['itemname']['id'] == $header_row)) {
                         // Found it - update the column.
                         $decimals = $grade_object->get_decimals();
-                        $this->tabledata[$key]['contributiontocoursetotal']['content'] = format_float($gradeval, $decimals, true);
+                        $this->tabledata[$key]['contributiontocoursetotal']['content'] = format_float($gradeval, $decimals, true) . ' %';
                         break;
                     }
                 }
diff --git a/grade/tests/behat/grade_aggregation.feature b/grade/tests/behat/grade_aggregation.feature
index 40e70637f2a..e8b5fded85d 100644
--- a/grade/tests/behat/grade_aggregation.feature
+++ b/grade/tests/behat/grade_aggregation.feature
@@ -394,16 +394,16 @@ Feature: We can use calculated grade totals
     And I set the field "Select all or one user" to "Student 1"
     And the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Range | Contribution to course total |
-      | Test assignment five | 28.57 % | 10.00 (50.00 %) | 0–20 | 6.43 |
-      | Test assignment six | 50.00 % | 5.00 (50.00 %) | 0–10 | 11.25 |
-      | Test assignment seven | 21.43 % | - | 0–15 | 0.00 |
-      | Test assignment eight | 66.67 % | 10.00 (50.00 %) | 0–20 | 10.00 |
-      | Test assignment nine | 33.33 % | 5.00 (50.00 %) | 0–10 | 5.00 |
-      | Test assignment ten | -( Empty ) | - | 0–15 | 0.00 |
-      | Test assignment one | 48.00 % | 60.00 (20.00 %) | 0–300 | 60.00 |
-      | Test assignment two | 16.00 % | 20.00 (20.00 %) | 0–100 | 20.00 |
-      | Test assignment three | 24.00 %( Extra credit ) | 40.00 (26.67 %) | 0–150 | 40.00 |
-      | Test assignment four | 24.00 % | - | 0–150 | 0.00 |
+      | Test assignment five | 28.57 % | 10.00 (50.00 %) | 0–20 | 1.03 % |
+      | Test assignment six | 50.00 % | 5.00 (50.00 %) | 0–10 | 1.80 % |
+      | Test assignment seven | 21.43 % | - | 0–15 | 0.00 % |
+      | Test assignment eight | 66.67 % | 10.00 (50.00 %) | 0–20 | 1.60 % |
+      | Test assignment nine | 33.33 % | 5.00 (50.00 %) | 0–10 | 0.80 % |
+      | Test assignment ten | -( Empty ) | - | 0–15 | 0.00 % |
+      | Test assignment one | 48.00 % | 60.00 (20.00 %) | 0–300 | 9.60 % |
+      | Test assignment two | 16.00 % | 20.00 (20.00 %) | 0–100 | 3.20 % |
+      | Test assignment three | 24.00 %( Extra credit ) | 40.00 (26.67 %) | 0–150 | 6.40 % |
+      | Test assignment four | 24.00 % | - | 0–150 | 0.00 % |
     And I log out
     And I log in as "student1"
     And I follow "Course 1"
@@ -413,13 +413,13 @@ Feature: We can use calculated grade totals
     And I set the field "Grade report" to "User report"
     And the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Range | Contribution to course total |
-      | Test assignment six | 70.00 % | 5.00 (50.00 %) | 0–10 | 8.75 |
-      | Test assignment seven | 30.00 % | - | 0–15 | 0.00 |
-      | Test assignment nine | 100.00 % | 5.00 (50.00 %) | 0–10 | 5.00 |
-      | Test assignment ten | -( Empty ) | - | 0–15 | 0.00 |
-      | Test assignment one | 61.86 % | 60.00 (20.00 %) | 0–300 | 60.0 |
-      | Test assignment three | 30.93 %( Extra credit ) | 40.00 (26.67 %) | 0–150 | 40.0 |
-      | Test assignment four | 30.93 % | - | 0–150 | 0.00 |
+      | Test assignment six | 70.00 % | 5.00 (50.00 %) | 0–10 | 1.80 % |
+      | Test assignment seven | 30.00 % | - | 0–15 | 0.00 % |
+      | Test assignment nine | 100.00 % | 5.00 (50.00 %) | 0–10 | 1.03 % |
+      | Test assignment ten | -( Empty ) | - | 0–15 | 0.00 % |
+      | Test assignment one | 61.86 % | 60.00 (20.00 %) | 0–300 | 12.37 % |
+      | Test assignment three | 30.93 %( Extra credit ) | 40.00 (26.67 %) | 0–150 | 8.25 % |
+      | Test assignment four | 30.93 % | - | 0–150 | 0.00 % |
 
   @javascript
   Scenario: Natural aggregation with drop lowest
@@ -587,15 +587,15 @@ Feature: We can use calculated grade totals
     And I set the field "Select all or one user" to "Student 1"
     And the following should exist in the "user-grade" table:
       | Grade item            | Calculated weight | Grade           | Contribution to course total |
-      | Test assignment five  | 57.14 %           | 10.00 (50.00 %) | 10.00                        |
-      | Test assignment six   | 0.00 %            | 5.00 (50.00 %)  | 0.00                         |
-      | Test assignment seven | 42.86 %           | -               | 0.00                         |
-      | Test assignment eight | 0.00 %            | 10.00 (50.00 %) | 0.00                         |
-      | Test assignment nine  | 100.00 %          | 5.00 (50.00 %)  | 5.00                         |
-      | Test assignment ten   | 0.00 %            | -               | 0.00                         |
-      | Test assignment one   | 0.00 %            | 60.00 (20.00 %) | 0.00                         |
-      | Test assignment two   | 22.47 %           | 20.00 (20.00 %) | 20.00                        |
-      | Test assignment three | 33.71 %           | 40.00 (26.67 %) | 40.00                        |
+      | Test assignment five  | 57.14 %           | 10.00 (50.00 %) | 2.25 %                        |
+      | Test assignment six   | 0.00 %            | 5.00 (50.00 %)  | 0.00 %                        |
+      | Test assignment seven | 42.86 %           | -               | 0.00 %                        |
+      | Test assignment eight | 0.00 %            | 10.00 (50.00 %) | 0.00 %                        |
+      | Test assignment nine  | 100.00 %          | 5.00 (50.00 %)  | 1.12 %                         |
+      | Test assignment ten   | 0.00 %            | -               | 0.00 %                         |
+      | Test assignment one   | 0.00 %            | 60.00 (20.00 %) | 0.00 %                         |
+      | Test assignment two   | 22.47 %           | 20.00 (20.00 %) | 4.49 %                        |
+      | Test assignment three | 33.71 %           | 40.00 (26.67 %) | 8.99 %                        |
       | Test assignment four  | 33.71 %           | -               | 0.00                         |
     And I log out
     And I log in as "student1"
@@ -606,10 +606,10 @@ Feature: We can use calculated grade totals
     And I set the field "Grade report" to "User report"
     And the following should exist in the "user-grade" table:
       | Grade item            | Calculated weight | Grade           | Contribution to course total |
-      | Test assignment six   | 0.00 %            | 5.00 (50.00 %)  | 0.00                         |
-      | Test assignment seven | 100.00 %          | -               | 0.00                         |
-      | Test assignment nine  | 100.00 %          | 5.00 (50.00 %)  | 5.00                         |
-      | Test assignment ten   | 0.00              | -               | 0.00                         |
-      | Test assignment one   | 0.00 %            | 60.00 (20.00 %) | 0.00                         |
-      | Test assignment three | 46.15 %           | 40.00 (26.67 %) | 40.00                        |
-      | Test assignment four  | 46.15 %           | -               | 0.00                         |
+      | Test assignment six   | 0.00 %            | 5.00 (50.00 %)  | 0.00 %                         |
+      | Test assignment seven | 100.00 %          | -               | 0.00 %                         |
+      | Test assignment nine  | 100.00 %          | 5.00 (50.00 %)  | 1.54 %                         |
+      | Test assignment ten   | 0.00              | -               | 0.00 %                         |
+      | Test assignment one   | 0.00 %            | 60.00 (20.00 %) | 0.00 %                         |
+      | Test assignment three | 46.15 %           | 40.00 (26.67 %) | 12.31 %                        |
+      | Test assignment four  | 46.15 %           | -               | 0.00 %                        |
diff --git a/grade/tests/behat/grade_calculated_weights.feature b/grade/tests/behat/grade_calculated_weights.feature
index fc61a26b4ac..13d1177f50a 100644
--- a/grade/tests/behat/grade_calculated_weights.feature
+++ b/grade/tests/behat/grade_calculated_weights.feature
@@ -65,12 +65,12 @@ Feature: We can understand the gradebook user report
     # Check the values in the weights column.
     Then the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Contribution to course total |
-      | Test assignment one | 25.00 % | 60.00 | 15.00 |
-      | Test assignment two | 25.00 % | 20.00 | 5.00 |
-      | Test assignment three | 25.00 % | 40.00 | 10.00 |
-      | Test assignment four | 33.33 % | 10.00 | 0.83 |
-      | Test assignment five | 33.33 % | 70.00 | 5.83 |
-      | Test assignment six | 33.33 % | 30.00 | 2.50 |
+      | Test assignment one | 25.00 % | 60.00 | 15.00 % |
+      | Test assignment two | 25.00 % | 20.00 | 5.00 % |
+      | Test assignment three | 25.00 % | 40.00 | 10.00 % |
+      | Test assignment four | 33.33 % | 10.00 | 0.83 % |
+      | Test assignment five | 33.33 % | 70.00 | 5.83 % |
+      | Test assignment six | 33.33 % | 30.00 | 2.50 % |
 
   @javascript
   Scenario: Weighted mean of grades aggregation
@@ -90,12 +90,12 @@ Feature: We can understand the gradebook user report
     # Check the values in the weights column.
     Then the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Contribution to course total |
-      | Test assignment one | 40.00 % | 60.00 | 24.00 |
-      | Test assignment two | 20.00 % | 20.00 | 4.00 |
-      | Test assignment three | 20.00 % | 40.00 | 8.00 |
-      | Test assignment four | 33.33 % | 10.00 | 0.67 |
-      | Test assignment five | 33.33 % | 70.00 | 4.67 |
-      | Test assignment six | 33.33 % | 30.00 | 2.00 |
+      | Test assignment one | 40.00 % | 60.00 | 24.00 % |
+      | Test assignment two | 20.00 % | 20.00 | 4.00 % |
+      | Test assignment three | 20.00 % | 40.00 | 8.00 % |
+      | Test assignment four | 33.33 % | 10.00 | 0.67 % |
+      | Test assignment five | 33.33 % | 70.00 | 4.67 % |
+      | Test assignment six | 33.33 % | 30.00 | 2.00 % |
 
   @javascript
   Scenario: Simple weighted mean of grades aggregation
@@ -111,12 +111,12 @@ Feature: We can understand the gradebook user report
     # Check the values in the weights column.
     Then the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Contribution to course total |
-      | Test assignment one | 33.33 % | 60.00 | 20.00 |
-      | Test assignment two | 33.33 % | 20.00 | 6.67 |
-      | Test assignment three | 33.33 %( Extra credit ) | 40.00 | 13.33 |
-      | Test assignment four | 33.33 % | 10.00 | 1.11 |
-      | Test assignment five | 33.33 % | 70.00 | 7.78 |
-      | Test assignment six | 33.33 % | 30.00 | 3.33 |
+      | Test assignment one | 33.33 % | 60.00 | 20.00 % |
+      | Test assignment two | 33.33 % | 20.00 | 6.67 % |
+      | Test assignment three | 33.33 %( Extra credit ) | 40.00 | 13.33 % |
+      | Test assignment four | 33.33 % | 10.00 | 1.11 % |
+      | Test assignment five | 33.33 % | 70.00 | 7.78 % |
+      | Test assignment six | 33.33 % | 30.00 | 3.33 % |
 
   @javascript
   Scenario: Mean of grades (with extra credits) aggregation
@@ -130,12 +130,12 @@ Feature: We can understand the gradebook user report
     # Check the values in the weights column.
     Then the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Contribution to course total |
-      | Test assignment one | 33.33 % | 60.00 | 20.00 |
-      | Test assignment two | 33.33 % | 20.00 | 6.67 |
-      | Test assignment three | 33.33 %( Extra credit ) | 40.00 | 13.33 |
-      | Test assignment four | 33.33 % | 10.00 | 1.11 |
-      | Test assignment five | 33.33 % | 70.00 | 7.78 |
-      | Test assignment six | 33.33 % | 30.00 | 3.33 |
+      | Test assignment one | 33.33 % | 60.00 | 20.00 % |
+      | Test assignment two | 33.33 % | 20.00 | 6.67 % |
+      | Test assignment three | 33.33 %( Extra credit ) | 40.00 | 13.33 % |
+      | Test assignment four | 33.33 % | 10.00 | 1.11 % |
+      | Test assignment five | 33.33 % | 70.00 | 7.78 % |
+      | Test assignment six | 33.33 % | 30.00 | 3.33 % |
 
   @javascript
   Scenario: Median of grades aggregation
@@ -147,12 +147,12 @@ Feature: We can understand the gradebook user report
     # Check the values in the weights column.
     Then the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Contribution to course total |
-      | Test assignment one | 0.00 % | 60.00 | 0.00 |
-      | Test assignment two | 0.00 % | 20.00 | 0.00 |
-      | Test assignment three | 50.00 % | 40.00 | 20.00 |
-      | Test assignment four | 33.33 % | 10.00 | 1.67 |
-      | Test assignment five | 33.33 % | 70.00 | 11.67 |
-      | Test assignment six | 33.33 % | 30.00 | 5.00 |
+      | Test assignment one | 0.00 % | 60.00 | 0.00 % |
+      | Test assignment two | 0.00 % | 20.00 | 0.00 % |
+      | Test assignment three | 50.00 % | 40.00 | 20.00 % |
+      | Test assignment four | 33.33 % | 10.00 | 1.67 % |
+      | Test assignment five | 33.33 % | 70.00 | 11.67 % |
+      | Test assignment six | 33.33 % | 30.00 | 5.00 % |
 
   @javascript
   Scenario: Lowest grade aggregation
@@ -164,12 +164,12 @@ Feature: We can understand the gradebook user report
     # Check the values in the weights column.
     Then the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Contribution to course total |
-      | Test assignment one | 0.00 % | 60.00 | 0.00 |
-      | Test assignment two | 100.00 % | 20.00 | 20.00 |
-      | Test assignment three | 0.00 % | 40.00 | 0.00 |
-      | Test assignment four | 33.33 % | 10.00 | 0.00 |
-      | Test assignment five | 33.33 % | 70.00 | 0.00 |
-      | Test assignment six | 33.33 % | 30.00 | 0.00 |
+      | Test assignment one | 0.00 % | 60.00 | 0.00 % |
+      | Test assignment two | 100.00 % | 20.00 | 20.00 % |
+      | Test assignment three | 0.00 % | 40.00 | 0.00 % |
+      | Test assignment four | 33.33 % | 10.00 | 0.00 % |
+      | Test assignment five | 33.33 % | 70.00 | 0.00 % |
+      | Test assignment six | 33.33 % | 30.00 | 0.00 % |
 
   @javascript
   Scenario: Highest grade aggregation
@@ -181,12 +181,12 @@ Feature: We can understand the gradebook user report
     # Check the values in the weights column.
     Then the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Contribution to course total |
-      | Test assignment one | 100.00 % | 60.00 | 60.00 |
-      | Test assignment two | 0.00 % | 20.00 | 0.00 |
-      | Test assignment three | 0.00 % | 40.00 | 0.00 |
-      | Test assignment four | 33.33 % | 10.00 | 0.00 |
-      | Test assignment five | 33.33 % | 70.00 | 0.00 |
-      | Test assignment six | 33.33 % | 30.00 | 0.00 |
+      | Test assignment one | 100.00 % | 60.00 | 60.00 % |
+      | Test assignment two | 0.00 % | 20.00 | 0.00 % |
+      | Test assignment three | 0.00 % | 40.00 | 0.00 % |
+      | Test assignment four | 33.33 % | 10.00 | 0.00 % |
+      | Test assignment five | 33.33 % | 70.00 | 0.00 % |
+      | Test assignment six | 33.33 % | 30.00 | 0.00 % |
 
   @javascript
   Scenario: Mode of grades aggregation
@@ -198,12 +198,12 @@ Feature: We can understand the gradebook user report
     # Check the values in the weights column.
     Then the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Contribution to course total |
-      | Test assignment one | 100.00 % | 60.00 | 60.00 |
-      | Test assignment two | 0.00 % | 20.00 | 0.00 |
-      | Test assignment three | 0.00 % | 40.00 | 0.00 |
-      | Test assignment four | 33.33 % | 10.00 | 0.00 |
-      | Test assignment five | 33.33 % | 70.00 | 0.00 |
-      | Test assignment six | 33.33 % | 30.00 | 0.00 |
+      | Test assignment one | 100.00 % | 60.00 | 60.00 % |
+      | Test assignment two | 0.00 % | 20.00 | 0.00 % |
+      | Test assignment three | 0.00 % | 40.00 | 0.00 % |
+      | Test assignment four | 33.33 % | 10.00 | 0.00 % |
+      | Test assignment five | 33.33 % | 70.00 | 0.00 % |
+      | Test assignment six | 33.33 % | 30.00 | 0.00 % |
 
   @javascript
   Scenario: View user report with mixed aggregation methods
@@ -219,12 +219,12 @@ Feature: We can understand the gradebook user report
     # Check the values in the weights column.
     Then the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Contribution to course total |
-      | Test assignment one | 33.33 % | 60.00 | 60.00 |
-      | Test assignment two | 33.33 % | 20.00 | 20.00 |
-      | Test assignment three | 33.33 %( Extra credit ) | 40.00 | 40.00 |
-      | Test assignment four | 33.33 % | 10.00 | 3.33 |
-      | Test assignment five | 33.33 % | 70.00 | 23.33 |
-      | Test assignment six | 33.33 % | 30.00 | 10.00 |
+      | Test assignment one | 33.33 % | 60.00 | 20.00 % |
+      | Test assignment two | 33.33 % | 20.00 | 6.67 % |
+      | Test assignment three | 33.33 %( Extra credit ) | 40.00 | 13.33 % |
+      | Test assignment four | 33.33 % | 10.00 | 1.11 % |
+      | Test assignment five | 33.33 % | 70.00 | 7.78 % |
+      | Test assignment six | 33.33 % | 30.00 | 3.33 % |
       | Category totalWeighted mean of grades. | 33.33 % | 36.67 | - |
       | Course total | - | 156.67 | - |
 
@@ -238,11 +238,11 @@ Feature: We can understand the gradebook user report
     # Check the values in the weights column.
     Then the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Contribution to course total |
-      | Test assignment one | 20.00 % | 60.00 | 60.00 |
-      | Test assignment two | 20.00 % | 20.00 | 20.00 |
-      | Test assignment three | 20.00 %( Extra credit ) | 40.00 | 40.00 |
-      | Test assignment four | 33.33 % | 10.00 | 10.00 |
-      | Test assignment five | 33.33 % | 70.00 | 70.00 |
-      | Test assignment six | 33.33 % | 30.00 | 30.00 |
+      | Test assignment one | 20.00 % | 60.00 | 12.00 % |
+      | Test assignment two | 20.00 % | 20.00 | 4.00 % |
+      | Test assignment three | 20.00 %( Extra credit ) | 40.00 | 8.00 % |
+      | Test assignment four | 33.33 % | 10.00 | 2.00 % |
+      | Test assignment five | 33.33 % | 70.00 | 14.00 % |
+      | Test assignment six | 33.33 % | 30.00 | 6.00 % |
       | Category total | 60.00 % | 110.00 | - |
       | Course total | - | 230.00 | - |
diff --git a/grade/tests/behat/grade_mingrade.feature b/grade/tests/behat/grade_mingrade.feature
index 05d80527ee3..3a1623fce5f 100644
--- a/grade/tests/behat/grade_mingrade.feature
+++ b/grade/tests/behat/grade_mingrade.feature
@@ -105,18 +105,18 @@ Feature: We can use a minimum grade different than zero
     And I set the field "Select all or one user" to "Student 1"
     Then the following should exist in the "user-grade" table:
       | Grade item    | Calculated weight | Grade  | Contribution to course total |
-      | Manual item 1 | 18.18 %           | -25.00 | -25.00                       |
-      | Manual item 2 | 18.18 %           | 50.00  | 50.00                        |
-      | Manual item 3 | 33.33 %           | -80.00 | -80.00                       |
-      | Manual item 4 | 66.67 %           | -10.00 | -10.00                       |
-      | Manual item 5 | 50.00 %           | 50.00  | 50.00                        |
-      | Manual item 6 | 50.00 %           | 75.00  | 75.00                        |
+      | Manual item 1 | 18.18 %           | -25.00 | -4.55 %                      |
+      | Manual item 2 | 18.18 %           | 50.00  | 9.09 %                       |
+      | Manual item 3 | 33.33 %           | -80.00 | -14.55 %                     |
+      | Manual item 4 | 66.67 %           | -10.00 | -1.82 %                      |
+      | Manual item 5 | 50.00 %           | 50.00  | 9.09 %                       |
+      | Manual item 6 | 50.00 %           | 75.00  | 13.64 %                      |
     And I set the field "Select all or one user" to "Student 2"
     And the following should exist in the "user-grade" table:
       | Grade item    | Calculated weight | Grade  | Contribution to course total |
-      | Manual item 1 | 18.18 %           | 0.00   | 0.00                         |
-      | Manual item 2 | 18.18 %           | 50.00  | 50.00                        |
-      | Manual item 3 | 33.33 %           | -10.00 | -10.00                       |
-      | Manual item 4 | 66.67 %           | 50.00  | 50.00                        |
-      | Manual item 5 | 50.00 %           | 50.00  | 50.00                        |
-      | Manual item 6 | 50.00 %           | 50.00  | 50.00                        |
\ No newline at end of file
+      | Manual item 1 | 18.18 %           | 0.00   | 0.00 %                       |
+      | Manual item 2 | 18.18 %           | 50.00  | 9.09 %                       |
+      | Manual item 3 | 33.33 %           | -10.00 | -1.82 %                      |
+      | Manual item 4 | 66.67 %           | 50.00  | 9.09 %                       |
+      | Manual item 5 | 50.00 %           | 50.00  | 9.09 %                       |
+      | Manual item 6 | 50.00 %           | 50.00  | 9.09 %                       |
diff --git a/grade/tests/behat/grade_scales.feature b/grade/tests/behat/grade_scales.feature
index c884ba856dd..c04f0f8f5a9 100644
--- a/grade/tests/behat/grade_scales.feature
+++ b/grade/tests/behat/grade_scales.feature
@@ -89,7 +89,7 @@ Feature: View gradebook when scales are used
     And I click on "Select all or one user" "select"
     And the following should exist in the "user-grade" table:
       | Grade item          | Grade | Range | Percentage | Contribution to course total |
-      | Test assignment one | C     | F–A   | 50.00 %    | 3.00                         |
+      | Test assignment one | C     | F–A   | 50.00 %    | 60.00 %                      |
       | Category total      | 3.00  | 0–5   | 60.00 %    | -                            |
       | Course total        | 3.00  | 0–5   | 60.00 %    | -                            |
     And I set the field "jump" to "Categories and items"
@@ -104,7 +104,7 @@ Feature: View gradebook when scales are used
     And I follow "Grades"
     And the following should exist in the "user-grade" table:
       | Grade item          | Grade | Range | Percentage | Contribution to course total |
-      | Test assignment one | B     | F–A   | 75.00 %    | 4.00                         |
+      | Test assignment one | B     | F–A   | 75.00 %    | 80.00 %                      |
       | Category total      | 4.00  | 0–5   | 80.00 %    | -                            |
       | Course total        | 4.00  | 0–5   | 80.00 %    | -                            |
 
@@ -158,11 +158,11 @@ Feature: View gradebook when scales are used
 
     Examples:
       | aggregation                         | coursetotal1 | coursetotal2 | coursetotal3 | coursetotal4 | coursetotal5 |overallavg | courseperc2 | courseperc3 | contrib2 | contrib3 |
-      | Mean of grades                      | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00    | 50.00    |
-      | Weighted mean of grades             | -            | -            | -            | -            | -            | -         | -           | -           | 0.00     | 0.00     |
-      | Simple weighted mean of grades      | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00    | 50.00    |
-      | Mean of grades (with extra credits) | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00    | 50.00    |
-      | Median of grades                    | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00    | 50.00    |
-      | Lowest grade                        | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00    | 50.00    |
-      | Highest grade                       | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00    | 50.00    |
-      | Mode of grades                      | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00    | 50.00    |
+      | Mean of grades                      | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00 %  | 50.00 %  |
+      | Weighted mean of grades             | -            | -            | -            | -            | -            | -         | -           | -           | 0.00 %   | 0.00 %   |
+      | Simple weighted mean of grades      | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00 %  | 50.00 %  |
+      | Mean of grades (with extra credits) | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00 %  | 50.00 %  |
+      | Median of grades                    | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00 %  | 50.00 %  |
+      | Lowest grade                        | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00 %  | 50.00 %  |
+      | Highest grade                       | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00 %  | 50.00 %  |
+      | Mode of grades                      | 100.00       | 75.00        | 50.00        | 25.00        | 0.00         | 50.00     | 75.00 %     | 50.00 %     | 75.00 %  | 50.00 %  |
diff --git a/grade/tests/behat/grade_single_item_scales.feature b/grade/tests/behat/grade_single_item_scales.feature
index 6692c49c6d9..ce00516ce3a 100644
--- a/grade/tests/behat/grade_single_item_scales.feature
+++ b/grade/tests/behat/grade_single_item_scales.feature
@@ -70,13 +70,13 @@ Feature: View gradebook when single item scales are used
     And I set the field "Select all or one user" to "Student 1"
     And the following should exist in the "user-grade" table:
       | Grade item          | Grade | Range     | Contribution to course total |
-      | Test assignment one | Ace!  | Ace!–Ace! | 1.00                         |
+      | Test assignment one | Ace!  | Ace!–Ace! | 100.00 %                     |
       | Category total      | 1.00  | 0–1       | -                            |
       | Course total        | 1.00  | 0–1       | -                            |
     And I set the field "Select all or one user" to "Student 2"
     And the following should exist in the "user-grade" table:
       | Grade item          | Grade | Range     | Contribution to course total |
-      | Test assignment one | -     | Ace!–Ace! | 0.00                         |
+      | Test assignment one | -     | Ace!–Ace! | 0.00 %                       |
       | Category total      | -     | 0–1       | -                            |
       | Course total        | -     | 0–1       | -                            |
     And I set the field "jump" to "Categories and items"
@@ -124,11 +124,11 @@ Feature: View gradebook when single item scales are used
 
     Examples:
       | aggregation                         | contrib1 | cattotal1 | coursetotal1 | catavg | overallavg |
-      | Mean of grades                      | 100.00   | 100.00    | 100.00       | 100.00 | 100.00     |
-      | Weighted mean of grades             | 0.00     | 100.00    | -            | 100.00 | -          |
-      | Simple weighted mean of grades      | 0.00     | -         | -            | -      | -          |
-      | Mean of grades (with extra credits) | 100.00   | 100.00    | 100.00       | 100.00 | 100.00     |
-      | Median of grades                    | 100.00   | 100.00    | 100.00       | 100.00 | 100.00     |
-      | Lowest grade                        | 100.00   | 100.00    | 100.00       | 100.00 | 100.00     |
-      | Highest grade                       | 100.00   | 100.00    | 100.00       | 100.00 | 100.00     |
-      | Mode of grades                      | 100.00   | 100.00    | 100.00       | 100.00 | 100.00     |
+      | Mean of grades                      | 100.00 % | 100.00    | 100.00       | 100.00 | 100.00     |
+      | Weighted mean of grades             | 0.00 %   | 100.00    | -            | 100.00 | -          |
+      | Simple weighted mean of grades      | 0.00 %   | -         | -            | -      | -          |
+      | Mean of grades (with extra credits) | 100.00 % | 100.00    | 100.00       | 100.00 | 100.00     |
+      | Median of grades                    | 100.00 % | 100.00    | 100.00       | 100.00 | 100.00     |
+      | Lowest grade                        | 100.00 % | 100.00    | 100.00       | 100.00 | 100.00     |
+      | Highest grade                       | 100.00 % | 100.00    | 100.00       | 100.00 | 100.00     |
+      | Mode of grades                      | 100.00 % | 100.00    | 100.00       | 100.00 | 100.00     |