diff --git a/tests/behat/features/manage-page-permisions.feature b/tests/behat/features/manage-page-permisions.feature
index d606d076..f751f3c7 100644
--- a/tests/behat/features/manage-page-permisions.feature
+++ b/tests/behat/features/manage-page-permisions.feature
@@ -1,56 +1,60 @@
-@todo
 Feature: Manage global page permissions
 As an administrator
 I want to manage view and edit permission defaults on pages
 In order to set good defaults and avoid repeating myself on each page
 
 Background:
-  Given I have an "Administrator" user in a "Administrators" Security Group
-  Given I have an "Content Author" user in a "Content Authors" Security Group
-  And I am logged in as an "ADMIN"
-  And I navigate to the "Settings" CMS section
+	Given a "page" "Home" with "Content"="Welcome"
+	And a "group" "AUTHOR group" has permissions "Access to 'Pages' section"
+	And a "group" "SECURITY group" has permissions "Access to 'Security' section"
+	And I am logged in with "ADMIN" permissions
+	And I go to "admin/settings"
+	And I click the "Access" CMS tab
 
 Scenario: I can open global view permissions to everyone
-    Given I select the 'Access' tab
-    And I select "Anyone" in the 'Who can view pages on this site?' field
-    And press the "Save" button
-   When I visit the homepage without being logged in
-   Then I can see "Welcome"
-   
+	Given I select "Anyone" from "Who can view pages on this site?" input group
+	And I press the "Save" button
+	When I am not logged in
+	And I go to the homepage
+	Then I should see "Welcome"
+
 Scenario: I can limit global view permissions to logged-in users
-    Given I select the 'Access' tab
-    And I select "Logged-in users" in 'Who can view pages on this site?'
-    And press the 'Save' button
-    When I visit the homepage without being logged in
-   Then I am redirected to the log-in page
-   When I visit the homepage as "Content Author"
-   Then I can see "Welcome"
+	Given I select "Logged-in users" from "Who can view pages on this site?" input group
+	And I press the "Save" button
+	When I am not logged in
+	And I go to the homepage
+	Then I should see a log-in form
+	When I am logged in with "AUTHOR" permissions
+	And I go to the homepage
+	Then I should see "Welcome"
 
 Scenario: I can limit global view permissions to certain groups
-    Given I select the 'Access' tab
-    And I select "Only these people (choose from list)" in 'Who can view pages on this site?'
-    And I select "Administrators" in the "Viewer Groups" dropdown
-    And press the 'Save' button
-    When I visit the homepage without being logged in
-   Then I am redirected to the log-in page
-   When I visit the homepage as "Content Author"
-   Then I am redirected to the log-in page
-   When I visit the homepage as "Administrator"
-   Then I can see "Welcome"
+	Given I select "Only these people (choose from list)" from "Who can view pages on this site?" input group
+	And I select "AUTHOR group" from "Viewer Groups"
+	And I press the "Save" button
+	When I am not logged in
+	And I go to the homepage
+	Then I should see a log-in form
+	When I am logged in with "SECURITY" permissions
+	And I go to the homepage
+	Then I will see a "warning" log-in message
+	When I am not logged in
+	And I am logged in with "AUTHOR" permissions
+	And I go to the homepage
+	Then I should see "Welcome"
 
+@todo
 Scenario: I can limit global edit permissions to logged-in users
-    Given I select the 'Access' tab
-    And I select "Logged-in users" in 'Who can edit pages on this site?'
-    And press the 'Save' button
-    Then pages should be editable by "Content Authors"
-    And pages should be editable by "Administrators"
+	Given I select "Logged-in users" in "Who can edit pages on this site?" input group
+	And I press the "Save" button
+	Then pages should be editable by "Content Authors"
+	And pages should be editable by "Administrators"
 
+@todo
 Scenario: I can limit global edit permissions to certain groups
-    Given I select the 'Access' tab
-    And I select "Only these people (choose from list)" in 'Who can edit pages on this site?'
-    And I select "Administrators" in the "Viewer Groups" dropdown
-    And press the 'Save' button
-    Then pages should not be editable by "Content Authors"
-    But pages should be editable by "Administrators"
+	Given I select "Only these people (choose from list)" from "Who can edit pages on this site?" input group
+	And I select "Administrators" from "Viewer Groups"
+	And I press the "Save" button
+	Then pages should not be editable by "Content Authors"
+	But pages should be editable by "Administrators"
 
-   
\ No newline at end of file