diff --git a/group/tests/behat/groups_import.feature b/group/tests/behat/groups_import.feature
index 57aca33119d..c6a0782c959 100644
--- a/group/tests/behat/groups_import.feature
+++ b/group/tests/behat/groups_import.feature
@@ -1,4 +1,4 @@
-@core @core_group
+@core @core_group @_only_local
 Feature: Importing of groups and groupings
   In order to import groups and grouping
   As a teacher
diff --git a/mod/scorm/tests/behat/add_scorm.feature b/mod/scorm/tests/behat/add_scorm.feature
index b4913cc9748..055488ef96a 100644
--- a/mod/scorm/tests/behat/add_scorm.feature
+++ b/mod/scorm/tests/behat/add_scorm.feature
@@ -1,4 +1,4 @@
-@mod @mod_scorm
+@mod @mod_scorm @_only_local
 Feature: Add scorm activity
   In order to let students access a scorm package
   As a teacher
@@ -37,3 +37,4 @@ Feature: Add scorm activity
     And I press "Enter"
     And I wait "5" seconds
     And I should see "Golf Explained"
+    And I follow "Course 1"
diff --git a/question/tests/behat/edit_questions.feature b/question/tests/behat/edit_questions.feature
index 903210dbe04..eb1c6103c80 100644
--- a/question/tests/behat/edit_questions.feature
+++ b/question/tests/behat/edit_questions.feature
@@ -4,7 +4,7 @@ Feature: A teacher can edit questions in the question bank
   As a teacher
   I need to edit questions
 
-  @javascript
+  @javascript @_switch_window
   Scenario: Edit a previously created question
     Given the following "users" exists:
       | username | firstname | lastname | email |
diff --git a/question/tests/behat/preview_question.feature b/question/tests/behat/preview_question.feature
index 2ec1952edde..25e20c4ac31 100644
--- a/question/tests/behat/preview_question.feature
+++ b/question/tests/behat/preview_question.feature
@@ -1,4 +1,4 @@
-@core @core_question
+@core @core_question @_switch_window
 Feature: A teacher can preview questions in the question bank
   In order to ensure the questions are properly created
   As a teacher