diff --git a/tests/features/courseTools.feature b/tests/features/courseTools.feature
index 70f5db98bd..cd0ac6bc9c 100644
--- a/tests/features/courseTools.feature
+++ b/tests/features/courseTools.feature
@@ -5,6 +5,13 @@ Feature: Course tools basic testing
   As a teacher
   I need to be able to enter a course and each of its tools
 
+  Scenario: Create a course before testing
+    Given I am a platform administrator
+    And I am on "/main/admin/course_add.php"
+    When I fill in "title" with "TEMP"
+    And I press "submit"
+    Then I should see "Course list"
+
   Scenario: Make sure the course exists
     Given I am a platform administrator
     Given course "TEMP" exists
diff --git a/tests/features/createUser.feature b/tests/features/createUser.feature
index 567096979e..7f5001ac70 100644
--- a/tests/features/createUser.feature
+++ b/tests/features/createUser.feature
@@ -27,7 +27,7 @@ Feature: Users management as admin
   Scenario: Search and delete a user
     Given I am a platform administrator
     And I am on "/main/admin/user_list.php"
-    And I fill in "user-search-keyword" with "smarshall"
+    And I fill in "keyword" with "smarshall"
     And I press "submit"
     When I follow "Delete"
     Then I should see "The user has been deleted"