diff --git a/lib/tests/behat/behat_hooks.php b/lib/tests/behat/behat_hooks.php
index aa8f95217a3..33585c4667a 100644
--- a/lib/tests/behat/behat_hooks.php
+++ b/lib/tests/behat/behat_hooks.php
@@ -343,28 +343,6 @@ class behat_hooks extends behat_base {
         $this->resize_window('medium');
     }
 
-    /**
-     * Executed after scenario to go to a page where no JS is executed.
-     * This will ensure there are no unwanted ajax calls from browser and
-     * site can be reset safely.
-     *
-     * @param AfterScenarioScope $scope scope passed by event fired after scenario.
-     * @AfterScenario
-     */
-    public function after_scenario(AfterScenarioScope $scope) {
-        try {
-            $this->wait_for_pending_js();
-            $this->getSession()->reset();
-        } catch (DriverException $e) {
-            // Try restart session, if DriverException caught.
-            try {
-                $this->getSession()->restart();
-            } catch (DriverException $e) {
-                // Do nothing, as this will be caught while starting session in before_scenario.
-            }
-        }
-    }
-
     /**
      * Wait for JS to complete before beginning interacting with the DOM.
      *
diff --git a/mod/lti/tests/behat/addtype.feature b/mod/lti/tests/behat/addtype.feature
index 3d1058694f6..06123f6a55e 100644
--- a/mod/lti/tests/behat/addtype.feature
+++ b/mod/lti/tests/behat/addtype.feature
@@ -34,7 +34,7 @@ Feature: Add preconfigured tools via teacher interface
     And the field "Icon URL" matches value "http://download.moodle.org/unittest/test.jpg"
     And the field "Secure icon URL" matches value "https://download.moodle.org/unittest/test.jpg"
 
-  @javascript
+  @javascript @_switch_window
   Scenario: Add a preconfigured tool from a cartridge
     When I log in as "teacher1"
     And I follow "Course 1"
@@ -58,7 +58,7 @@ Feature: Add preconfigured tools via teacher interface
     And I press "Cancel"
     And I switch to the main window
 
-  @javascript
+  @javascript @_switch_window
   Scenario: Add and use a preconfigured tool
     When I log in as "teacher1"
     And I follow "Course 1"
diff --git a/mod/scorm/tests/behat/add_scorm.feature b/mod/scorm/tests/behat/add_scorm.feature
index b7c09b057d8..0a04e3d4f9d 100644
--- a/mod/scorm/tests/behat/add_scorm.feature
+++ b/mod/scorm/tests/behat/add_scorm.feature
@@ -1,4 +1,4 @@
-@mod @mod_scorm @_file_upload @_switch_frame
+@mod @mod_scorm @_file_upload @_switch_iframe
 Feature: Add scorm activity
   In order to let students access a scorm package
   As a teacher