diff --git a/package.json b/package.json
index e9c7b6e5595d..19478f4ae2cf 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "marked": "^0.3.2",
     "marked-text-renderer": "^0.1.0",
     "mkdirp": "^0.5.0",
-    "mocha": "~1.20.1",
+    "mocha": "^2.2.5",
     "mocha-screencast-reporter": "~0.1.4",
     "opn": "~1.0.0",
     "path-browserify": "0.0.0",
diff --git a/src/kibana/components/filter_bar/lib/generateMappingChain.js b/src/kibana/components/filter_bar/lib/generateMappingChain.js
index b908ea343635..092a14e21f4f 100644
--- a/src/kibana/components/filter_bar/lib/generateMappingChain.js
+++ b/src/kibana/components/filter_bar/lib/generateMappingChain.js
@@ -14,7 +14,7 @@ define(function (require) {
             if (result === filter) {
               return next(filter);
             }
-            throw result;
+            return Promise.reject(result);
           });
         };
       };
diff --git a/test/unit/specs/components/agg_response/geo_json/geo_json.js b/test/unit/specs/components/agg_response/geo_json/geo_json.js
index faced1b13ec0..ae5ec53fdb50 100644
--- a/test/unit/specs/components/agg_response/geo_json/geo_json.js
+++ b/test/unit/specs/components/agg_response/geo_json/geo_json.js
@@ -52,7 +52,6 @@ define(function (require) {
       }
 
       describe('with table ' + JSON.stringify(tableOpts), function () {
-
         it('outputs a chart', function () {
           var table = makeTable();
           var chart = makeSingleChart(table);
@@ -100,6 +99,8 @@ define(function (require) {
 
         describe('properties', function () {
           it('includes one feature per row in the table', function () {
+            this.timeout(0);
+
             var table = makeTable();
             var chart = makeSingleChart(table);
             var geoColI = _.findIndex(table.columns, { aggConfig: aggs.geo });
diff --git a/test/unit/specs/components/filter_bar/generateMappingChain.js b/test/unit/specs/components/filter_bar/generateMappingChain.js
index 283133791389..1d2e4d12f39d 100644
--- a/test/unit/specs/components/filter_bar/generateMappingChain.js
+++ b/test/unit/specs/components/filter_bar/generateMappingChain.js
@@ -15,13 +15,14 @@ define(function (require) {
 
 
       it('should create a chaning function which calls the next function if the promise is rejected', function (done) {
+        var filter = {};
         var mapping = sinon.stub();
-        mapping.returns(Promise.reject());
+        mapping.returns(Promise.reject(filter));
         var mappingChainFn = generateMappingChain(mapping);
         var next = sinon.stub();
         next.returns(Promise.resolve('good'));
         var chain = mappingChainFn(next);
-        chain({}).then(function (result) {
+        chain(filter).then(function (result) {
           expect(result).to.be('good');
           sinon.assert.calledOnce(next);
           done();
@@ -75,13 +76,14 @@ define(function (require) {
       });
 
       it('should resolve result for the next function', function (done) {
+        var filter = {};
         var mapping = sinon.stub();
-        mapping.returns(Promise.reject());
+        mapping.returns(Promise.reject(filter));
         var mappingChainFn = generateMappingChain(mapping);
         var next = sinon.stub();
         next.returns(Promise.resolve({ key: 'test', value: 'example' }));
         var chain = mappingChainFn(next);
-        chain({}).then(function (result) {
+        chain(filter).then(function (result) {
           sinon.assert.calledOnce(mapping);
           sinon.assert.calledOnce(next);
           expect(result).to.eql({ key: 'test', value: 'example' });
@@ -91,13 +93,14 @@ define(function (require) {
       });
 
       it('should reject with an error if no functions match', function (done) {
+        var filter = {};
         var mapping = sinon.stub();
-        mapping.returns(Promise.reject());
+        mapping.returns(Promise.reject(filter));
         var mappingChainFn = generateMappingChain(mapping);
         var chain = mappingChainFn();
-        chain({}).catch(function (err) {
+        chain(filter).catch(function (err) {
           expect(err).to.be.an(Error);
-          expect(err.message).to.be('No mapping have been found for filter.');
+          expect(err.message).to.be('No mappings have been found for filter.');
           done();
         });
         $rootScope.$apply();