diff --git a/grade/grading/form/rubric/tests/behat/publish_rubric_templates.feature b/grade/grading/form/rubric/tests/behat/publish_rubric_templates.feature
new file mode 100644
index 00000000000..302a12f867a
--- /dev/null
+++ b/grade/grading/form/rubric/tests/behat/publish_rubric_templates.feature
@@ -0,0 +1,56 @@
+@gradingform @gradingform_rubric
+Feature: Publish rubrics as templates
+  In order to save time to teachers
+  As a manager
+  I need to publish rubrics and make them available to all teachers
+
+  Background:
+    Given the following "users" exists:
+      | username | firstname | lastname | email |
+      | teacher1 | Teacher | 1 | teacher1@asd.com |
+      | manager1 | Manager | 1 | manager1@asd.com |
+    And the following "courses" exists:
+      | fullname | shortname | format |
+      | Course 1 | C1 | topics |
+    And the following "activities" exists:
+      | activity | course | idnumber | name                   | intro | advancedgradingmethod_submissions |
+      | assign   | C1     | A1       | Test assignment 1 name | TA1   | rubric                            |
+      | assign   | C1     | A2       | Test assignment 2 name | TA2   | rubric                            |
+    And the following "course enrolments" exists:
+      | user | course | role |
+      | teacher1 | C1 | editingteacher |
+    And the following "system role assigns" exists:
+      | user | role | contextlevel | reference |
+      | manager1 | manager | System | |
+    And I log in as "manager1"
+    And I follow "Course 1"
+    And I go to "Test assignment 1 name" advanced grading definition page
+    And I fill the moodle form with:
+      | Name | Assignment 1 rubric |
+      | Description | Assignment 1 description |
+    And I define the following rubric:
+      | Criterion 1 | Level 11 | 11 | Level 12 | 12 |
+      | Criterion 2 | Level 21 | 21 | Level 22 | 22 |
+    And I press "Save rubric and make it ready"
+    When I publish "Test assignment 1 name" grading form definition as a public template
+    And I log out
+    And I log in as "teacher1"
+    And I follow "Course 1"
+    And I set "Test assignment 2 name" activity to use "Assignment 1 rubric" grading form
+    Then I should see "Advanced grading: Test assignment 2 name (Submissions)"
+    And I should see "Criterion 1"
+    And I should see "Assignment 1 description"
+    And I go to "Test assignment 2 name" advanced grading definition page
+    And I should see "Current rubric status"
+
+  @javascript
+  Scenario: Create a rubric template and reuse it as a teacher, with Javascript enabled
+    Then the "Description" field should match "<p>Assignment 1 description</p>" value
+    And I should see "Criterion 1"
+    And I press "Cancel"
+
+  Scenario: Create a rubric template and reuse it as a teacher, with Javascript disabled
+    Then the "Description" field should match "Assignment 1 description" value
+    # Trying to avoid pointing by id or name as the code internals may change.
+    And "//table[@class='criteria']//textarea[text()='Criterion 1']" "xpath_element" should exists
+    And I press "Cancel"
diff --git a/grade/grading/form/rubric/tests/behat/reuse_rubrics.feature b/grade/grading/form/rubric/tests/behat/reuse_own_rubrics.feature
similarity index 97%
rename from grade/grading/form/rubric/tests/behat/reuse_rubrics.feature
rename to grade/grading/form/rubric/tests/behat/reuse_own_rubrics.feature
index a6998ab61bf..0c3799cccdc 100644
--- a/grade/grading/form/rubric/tests/behat/reuse_rubrics.feature
+++ b/grade/grading/form/rubric/tests/behat/reuse_own_rubrics.feature
@@ -1,5 +1,5 @@
 @gradingform @gradingform_rubric
-Feature: Reuse rubrics in other activities
+Feature: Reuse my rubrics in other activities
   In order to save time creating duplicated grading forms
   As a teacher
   I need to reuse rubrics that I created previously