diff --git a/lib/behat/form_field/behat_form_select.php b/lib/behat/form_field/behat_form_select.php
index 8d6d9aa61e2..4f7a34f3d06 100644
--- a/lib/behat/form_field/behat_form_select.php
+++ b/lib/behat/form_field/behat_form_select.php
@@ -71,10 +71,9 @@ class behat_form_select extends behat_form_field {
         // Wait for all the possible AJAX requests that have been
         // already triggered by selectOption() to be finished.
         if ($this->running_javascript()) {
-            // Trigger change event as this is needed by some drivers (Phantomjs). Don't do it for
+            // Trigger change event as this is needed by some drivers (Phantomjs, Mac-FF). Don't do it for
             // Singleselect as this will cause multiple event fire and lead to race-around condition.
-            $browser = \Moodle\BehatExtension\Driver\MoodleSelenium2Driver::getBrowser();
-            if (!$singleselect && ($browser == 'phantomjs')) {
+            if (!$singleselect) {
                 $script = "Syn.trigger('change', {}, {{ELEMENT}})";
                 try {
                     $this->session->getDriver()->triggerSynScript($this->field->getXpath(), $script);
diff --git a/mod/assign/tests/behat/quickgrading.feature b/mod/assign/tests/behat/quickgrading.feature
index 84af9b40015..85a6aefe596 100644
--- a/mod/assign/tests/behat/quickgrading.feature
+++ b/mod/assign/tests/behat/quickgrading.feature
@@ -40,6 +40,7 @@ Feature: In an assignment, teachers grade multiple students on one page
     And I follow "Test assignment name"
     And I follow "View all submissions"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I wait until the page is ready
     And I press "Save changes"
     And I press "Ok"
     And I click on "Edit settings" "link"