diff --git a/tests/behat/features/search-for-a-page.feature b/tests/behat/features/search-for-a-page.feature
index 1da95bd9..d98aeb1f 100644
--- a/tests/behat/features/search-for-a-page.feature
+++ b/tests/behat/features/search-for-a-page.feature
@@ -17,38 +17,35 @@ Feature: Search for a page
 		Then I should see "About Us" in the tree
 		But I should not see "Contact Us" in the tree
 
-	@todo
 	Scenario: I can search for a page by its type
-		Given a "page" "My Error Page" of type "Error Page"
-		And I fill in "Page Type" with "Redirector Page"
+		Given a "Error Page" "My Error Page"
+		When I select "Error Page" from "Page Type"
 		And I press the "Apply Filter" button
 		Then I should see "My Error Page" in the tree
 		But I should not see "Contact Us" in the tree
 
-	@todo
 	Scenario: I can search for a page by its oldest last edited date
 		Given a "page" "Recent Page"
-		And a "page" "Old Page" was last edited 7 days ago
-		When I fill in "From" with "5 days ago"
+		And a "page" "Old Page" was last edited "7 days ago"
+		When I fill in "From" with "the date of 5 days ago"
 		And I press the "Apply Filter" button
 		Then I should see "Recent Page" in the tree
 		But I should not see "Old Page" in the tree
 
-	@todo
 	Scenario: I can search for a page by its newest last edited date
 		Given a "page" "Recent Page"
-		And a "page" "Old Page" was last edited 7 days ago
-		When I fill in "To" with "5 days ago"
+		And a "page" "Old Page" was last edited "7 days ago"
+		When I fill in "To" with "the date of 5 days ago"
 		And I press the "Apply Filter" button
 		Then I should not see "Recent Page" in the tree
 		But I should see "Old Page" in the tree
 
-	@todo
+
 	Scenario: I can include deleted pages in my search
 		Given a "page" "Deleted Page"
-		And the "page" "Old Page" is deleted
+		And the "page" "Deleted Page" is deleted
 		When I press the "Apply Filter" button
 		Then I should not see "Deleted Page" in the tree
-		When I fill in "Pages" with "All pages, including deleted"
+		When I select "All pages, including deleted" from "Pages"
 		And I press the "Apply Filter" button
 		Then I should see "Deleted Page" in the tree
\ No newline at end of file