diff --git a/calendar/tests/behat/category_events.feature b/calendar/tests/behat/category_events.feature
index be4721b630b..17a45387d32 100644
--- a/calendar/tests/behat/category_events.feature
+++ b/calendar/tests/behat/category_events.feature
@@ -47,18 +47,22 @@ Feature: Course Category Events
       | student2    | B1i       | student           |
       | student2    | B2i       | student           |
     And the following "events" exist:
-      | name        | eventtype | category          | course |
-      | Site event  | global    |                   |        |
-      | FA event    | category  | faculty-a         |        |
-      | DA1 event   | category  | department-a1     |        |
-      | DA2 event   | category  | department-a1     |        |
-      | FB event    | category  | faculty-b         |        |
-      | DB1 event   | category  | department-b1     |        |
-      | DB2 event   | category  | department-b1     |        |
-      | CA1i event  | course    |                   | A1i    |
-      | CA2i event  | course    |                   | A2i    |
-      | CB1i event  | course    |                   | B1i    |
-      | CB2i event  | course    |                   | B2i    |
+      | name        | eventtype |
+      | Site event  | global    |
+    And the following "events" exist:
+      | name        | eventtype | course |
+      | CA1i event  | course    | A1i    |
+      | CA2i event  | course    | A2i    |
+      | CB1i event  | course    | B1i    |
+      | CB2i event  | course    | B2i    |
+    And the following "events" exist:
+      | name        | eventtype | category          |
+      | FA event    | category  | faculty-a         |
+      | DA1 event   | category  | department-a1     |
+      | DA2 event   | category  | department-a1     |
+      | FB event    | category  | faculty-b         |
+      | DB1 event   | category  | department-b1     |
+      | DB2 event   | category  | department-b1     |
 
   @javascript
   Scenario: Manager of a Category can see all child and parent events in their category
diff --git a/lib/tests/behat/behat_data_generators.php b/lib/tests/behat/behat_data_generators.php
index 7f0d2bf2d63..d0bdb8eee7c 100644
--- a/lib/tests/behat/behat_data_generators.php
+++ b/lib/tests/behat/behat_data_generators.php
@@ -227,7 +227,7 @@ class behat_data_generators extends behat_base {
                     $methodname = 'get_' . $element . '_id';
 
                     // Not all the switch fields are required, default vars will be assigned by data generators.
-                    if (!empty($elementdata[$element])) {
+                    if (isset($elementdata[$element])) {
                         // Temp $id var to avoid problems when $element == $field.
                         $id = $this->{$methodname}($elementdata[$element]);
                         unset($elementdata[$element]);