diff --git a/mod/course/tests/behat/app_basic_usage.feature b/mod/course/tests/behat/app_basic_usage.feature
index 59a69c6b3..e252e7943 100755
--- a/mod/course/tests/behat/app_basic_usage.feature
+++ b/mod/course/tests/behat/app_basic_usage.feature
@@ -485,7 +485,7 @@ Feature: Test basic usage of one course in app
     And I should find "Test scorm name" in the app
     And I should find "Test workshop name" in the app
 
-  Scenario: View blocks bellow/beside contents also when All sections selected
+  Scenario: View blocks below/beside contents also when All sections selected
     Given I enter the app
     And I log in as "teacher1"
     And I press "Course 1" near "Recently accessed courses" in the app
@@ -498,7 +498,7 @@ Feature: Test basic usage of one course in app
     And I click on "Side panel" "button"
     And I follow "Add a block"
     And I follow "HTML"
-    And I click on "[aria-label=\"Close drawer\"]" "css_element"
+    And I click on "#theme_boost-drawers-blocks [aria-label=\"Close drawer\"]" "css_element"
     And I click on "Side panel" "button"
     And I follow "Add a block"
     And I follow "Activities"
diff --git a/mod/login/tests/behat/app_basic_usage.feature b/mod/login/tests/behat/app_basic_usage.feature
index e3b5c3bab..0685c75c2 100755
--- a/mod/login/tests/behat/app_basic_usage.feature
+++ b/mod/login/tests/behat/app_basic_usage.feature
@@ -56,34 +56,13 @@ Feature: Test basic usage of login in app
   Scenario: Require minium version of the app for a site
 
     # Log in with a previous required version
+    Given the following config values are set as admin:
+      | minimumversion | 3.8.1 | tool_mobile |
     When I enter the app
-    And I log in as "teacher1"
-    And I press the main menu button in the app
-    And I press "Website" in the app
-    And I switch to the browser tab opened by the app
-    And I follow "Log in"
-    And I log in as "admin"
-    And I press "Side panel"
-    And I follow "Site administration"
-    And I follow "Mobile authentication"
-    And I set the field "Minimum app version required" to "3.8.1"
-    And I press "Save changes"
-    And I close the browser tab opened by the app
-    And I enter the app
     Then I should not find "App update required" in the app
 
     # Log in with a future required version
-    When I log in as "teacher1"
-    And I press the main menu button in the app
-    And I press "Website" in the app
-    And I switch to the browser tab opened by the app
-    And I follow "Log in"
-    And I log in as "admin"
-    And I press "Side panel"
-    And I follow "Site administration"
-    And I follow "Mobile authentication"
-    And I set the field "Minimum app version required" to "11.0.0"
-    And I press "Save changes"
-    And I close the browser tab opened by the app
-    And I enter the app
+    Given the following config values are set as admin:
+      | minimumversion | 11.0.0 | tool_mobile |
+    When I enter the app
     Then I should find "App update required" in the app