diff --git a/src/addons/block/timeline/tests/behat/basic_usage-310.feature b/src/addons/block/timeline/tests/behat/basic_usage-311.feature
similarity index 99%
rename from src/addons/block/timeline/tests/behat/basic_usage-310.feature
rename to src/addons/block/timeline/tests/behat/basic_usage-311.feature
index 58dda605c..e7501b5f9 100644
--- a/src/addons/block/timeline/tests/behat/basic_usage-310.feature
+++ b/src/addons/block/timeline/tests/behat/basic_usage-311.feature
@@ -1,4 +1,4 @@
-@block @block_timeline @app @javascript @lms_upto3.10
+@block @block_timeline @app @javascript @lms_upto3.11
 Feature: Timeline block.
 
   Background:
diff --git a/src/addons/block/timeline/tests/behat/basic_usage.feature b/src/addons/block/timeline/tests/behat/basic_usage.feature
index 573d6c6c3..f69fc3f3a 100644
--- a/src/addons/block/timeline/tests/behat/basic_usage.feature
+++ b/src/addons/block/timeline/tests/behat/basic_usage.feature
@@ -46,7 +46,7 @@ Feature: Timeline block.
       | assign   | C3                   | assign24  | Assignment 24 | ##+1 year##    |
       | assign   | C3                   | assign25  | Assignment 25 | ##+1 year##    |
 
-  @lms_from3.11
+  @lms_from4.0
   Scenario: See courses inside block
     Given I entered the app as "student1"
     Then I should find "Assignment 00" within "Timeline" "ion-card" in the app
diff --git a/src/core/features/comments/tests/behat/basic_usage.feature b/src/core/features/comments/tests/behat/basic_usage.feature
index f431b3e96..6f4c9ff3f 100644
--- a/src/core/features/comments/tests/behat/basic_usage.feature
+++ b/src/core/features/comments/tests/behat/basic_usage.feature
@@ -23,6 +23,8 @@ Feature: Test basic usage of comments in app
       | activity | name      | intro        | course | idnumber | comments |
       | data     | Data      | Data info    | C1     | data1    | 1        |
 
+  # Skip in master until MDL-75353 is fixed
+  @lms_upto4.0
   Scenario: Add comments & Delete comments (database)
     # Create database entry and comment as a teacher
     Given I entered the data activity "Data" on course "Course 1" as "teacher1" in the app
@@ -74,6 +76,8 @@ Feature: Test basic usage of comments in app
     When I press the back button in the app
     Then I should find "Comments (1)" in the app
 
+  # Skip in master until MDL-75353 is fixed
+  @lms_upto4.0
   Scenario: Add comments offline & Delete comments offline & Sync comments (database)
     Given I entered the data activity "Data" on course "Course 1" as "teacher1" in the app
     And I press "Information" in the app
diff --git a/src/core/features/course/tests/behat/basic_usage.feature b/src/core/features/course/tests/behat/basic_usage.feature
index 078555930..322516ba9 100755
--- a/src/core/features/course/tests/behat/basic_usage.feature
+++ b/src/core/features/course/tests/behat/basic_usage.feature
@@ -71,6 +71,8 @@ Feature: Test basic usage of one course in app
       | activity      | name                  | intro             | course | idnumber       | groupmode | section |
       | workshop      | Test workshop name    | Test workshop     | C1     | workshop       | 0         | 3       |
 
+  # Skip in master until MDL-75353 is fixed
+  @lms_upto4.0
   Scenario: View course contents
     When I entered the course "Course 1" as "student1" in the app
     Then the header should be "Course 1" in the app
@@ -146,6 +148,8 @@ Feature: Test basic usage of one course in app
     And I press "Test workshop name" in the app
     Then the header should be "Test workshop name" in the app
 
+  # Skip in master until MDL-75353 is fixed
+  @lms_upto4.0
   Scenario: View section contents
     When I entered the course "Course 1" as "student1" in the app
     Then the header should be "Course 1" in the app
diff --git a/src/core/features/courses/tests/behat/basic_usage-310.feature b/src/core/features/courses/tests/behat/basic_usage-310.feature
index 8b28fede8..e34eb0b25 100755
--- a/src/core/features/courses/tests/behat/basic_usage-310.feature
+++ b/src/core/features/courses/tests/behat/basic_usage-310.feature
@@ -73,7 +73,9 @@ Feature: Test basic usage of courses in app
     When I press "Open block drawer" in the app
     And I press "Grade" in the app
     Then the header should be "assignment" in the app
-    And I should find "Test assignment description" in the app
+
+    When I pull to refresh in the app
+    Then I should find "Test assignment description" in the app
     And I should find "Time remaining" in the app
 
     When I press "Needs grading" in the app
diff --git a/src/core/features/courses/tests/behat/basic_usage-311.feature b/src/core/features/courses/tests/behat/basic_usage-311.feature
index 91589822b..fd43cb910 100755
--- a/src/core/features/courses/tests/behat/basic_usage-311.feature
+++ b/src/core/features/courses/tests/behat/basic_usage-311.feature
@@ -118,7 +118,9 @@ Feature: Test basic usage of courses in app
     When I press "Open block drawer" in the app
     And I press "Grade" in the app
     Then the header should be "assignment" in the app
-    And I should find "Test assignment description" in the app
+
+    When I pull to refresh in the app
+    Then I should find "Test assignment description" in the app
     And I should find "Time remaining" in the app
 
     When I press "Needs grading" in the app