diff --git a/mod/book/tests/behat/create_chapters.feature b/mod/book/tests/behat/create_chapters.feature
index 60035f7147a..1b8b82ddbba 100644
--- a/mod/book/tests/behat/create_chapters.feature
+++ b/mod/book/tests/behat/create_chapters.feature
@@ -4,29 +4,30 @@ Feature: In a book, create chapters and sub chapters
   As a teacher
   I need to add chapters and subchapters to a book.
 
-  Scenario: create chapters and sub chapters and naviagte between them
-    Given the following "courses" exist:
-      | fullname | shortname | category | groupmode |
-      | Course 1 | C1 | 0 | 1 |
-    And the following "users" exist:
+  Background:
+    Given the following "users" exist:
       | username | firstname | lastname | email |
       | teacher1 | Teacher | 1 | teacher1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | format |
+      | Course 1 | C1 | topics |
     And the following "course enrolments" exist:
       | user | course | role |
       | teacher1 | C1 | editingteacher |
     And I log in as "teacher1"
     And I follow "Course 1"
     And I turn editing mode on
-    When I add a "Book" to section "1" and I fill the form with:
+    And I add a "Book" to section "1" and I fill the form with:
       | Name | Test book |
       | Description | A book about dreams! |
-    And I follow "Test book"
-    Then I should see "Add new chapter"
+
+  Scenario: Create chapters and sub chapters and navigate between them
+    Given I follow "Test book"
+    And I should see "Add new chapter"
     And I set the following fields to these values:
       | Chapter title | Dummy first chapter |
       | Content | Dream is the start of a journey |
     And I press "Save changes"
-    And I should see "1 Dummy first chapter" in the "Table of contents" "block"
     And I click on "Add new chapter" "link" in the "Table of contents" "block"
     And I set the following fields to these values:
       | Chapter title | Dummy second chapter |
@@ -51,9 +52,27 @@ Feature: In a book, create chapters and sub chapters
     And I follow "Test book"
     And I should not see "Previous" in the ".book_content" "css_element"
     And I should see "1 Dummy first chapter" in the "strong" "css_element"
-    And I click on "Next" "link"
-    And I should see "1.1 Dummy first subchapter" in the ".book_content" "css_element"
+    When I click on "Next" "link"
+    Then I should see "1.1 Dummy first subchapter" in the ".book_content" "css_element"
     And I should see "1.1 Dummy first subchapter" in the "strong" "css_element"
     And I click on "Previous" "link"
     And I should see "1 Dummy first chapter" in the ".book_content" "css_element"
-    And I should see "1 Dummy first chapter" in the "strong" "css_element"
\ No newline at end of file
+    And I should see "1 Dummy first chapter" in the "strong" "css_element"
+
+  Scenario: Change editing mode for an individual chapter
+    Given I follow "Test book"
+    And I should see "Add new chapter"
+    And I set the following fields to these values:
+      | Chapter title | Dummy first chapter |
+      | Content | Dream is the start of a journey |
+    And I press "Save changes"
+    And I should see "1 Dummy first chapter" in the "Table of contents" "block"
+    And "Edit" "link" should exist in the "Table of contents" "block"
+    And "Delete" "link" should exist in the "Table of contents" "block"
+    And "Hide" "link" should exist in the "Table of contents" "block"
+    And "Add new chapter" "link" should exist in the "Table of contents" "block"
+    When I click on "Turn editing off" "link" in the "Administration" "block"
+    Then "Edit" "link" should not exist in the "Table of contents" "block"
+    And "Delete" "link" should not exist in the "Table of contents" "block"
+    And "Hide" "link" should not exist in the "Table of contents" "block"
+    And "Add new chapter" "link" should not exist in the "Table of contents" "block"
\ No newline at end of file