diff --git a/tests/behat/app_behat_runtime.js b/tests/behat/app_behat_runtime.js
index 0584a4eb3..831c354df 100644
--- a/tests/behat/app_behat_runtime.js
+++ b/tests/behat/app_behat_runtime.js
@@ -98,15 +98,20 @@
         var index = requestIndex++;
         var key = 'httprequest-' + index;
 
-        // Add to the list of pending requests.
-        addPending(key);
+        try {
+            // Add to the list of pending requests.
+            addPending(key);
 
-        // Detect when it finishes and remove it from the list.
-        this.addEventListener('loadend', function() {
+            // Detect when it finishes and remove it from the list.
+            this.addEventListener('loadend', function() {
+                removePending(key);
+            });
+
+            return realOpen.apply(this, arguments);
+        } catch (e) {
             removePending(key);
-        });
-
-        return realOpen.apply(this, arguments);
+            throw e;
+        }
     };
 
     var waitingBlocked = false;