diff --git a/test/helpers.js b/test/helpers.js
index efe35ff09c..2c76ee71eb 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -111,6 +111,9 @@ var prepareText = module.exports.prepareText = function (text) {
 module.exports.expectContent = function (content, done) {
   return function (err, res) {
     if (err) {
+      if (_.isFunction(done)) {
+        return done(err);
+      }
       throw err;
     }