diff --git a/services/web/bin/unit_test b/services/web/bin/unit_test
index b7e14f514f..5188374896 100755
--- a/services/web/bin/unit_test
+++ b/services/web/bin/unit_test
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e;
 
-MOCHA="node_modules/.bin/mocha --exit --recursive --reporter spec"
+MOCHA="node_modules/.bin/mocha --exit --recursive --reporter spec --require test/unit/bootstrap.js"
 
 $MOCHA "$@" test/unit/js
 
diff --git a/services/web/bin/unit_test_app b/services/web/bin/unit_test_app
index d0c3278618..1ba6ecce91 100755
--- a/services/web/bin/unit_test_app
+++ b/services/web/bin/unit_test_app
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e;
 
-MOCHA="node_modules/.bin/mocha --exit --recursive --reporter spec"
+MOCHA="node_modules/.bin/mocha --exit --recursive --reporter spec --require test/unit/bootstrap.js"
 
 $MOCHA "$@" test/unit/js
diff --git a/services/web/test/unit/bootstrap.js b/services/web/test/unit/bootstrap.js
new file mode 100644
index 0000000000..292d14753a
--- /dev/null
+++ b/services/web/test/unit/bootstrap.js
@@ -0,0 +1,5 @@
+const chai = require('chai')
+
+// Load sinon-chai assertions so expect(stubFn).to.have.been.calledWith('abc')
+// has a nicer failure messages
+chai.use(require('sinon-chai'))
diff --git a/services/web/test/unit/coffee/Authentication/AuthenticationControllerTests.coffee b/services/web/test/unit/coffee/Authentication/AuthenticationControllerTests.coffee
index 70e667af58..ba04b5d4b9 100644
--- a/services/web/test/unit/coffee/Authentication/AuthenticationControllerTests.coffee
+++ b/services/web/test/unit/coffee/Authentication/AuthenticationControllerTests.coffee
@@ -1,7 +1,5 @@
 sinon = require('sinon')
 chai = require('chai')
-sinonChai = require "sinon-chai"
-chai.use sinonChai
 should = chai.should()
 expect = chai.expect
 modulePath = "../../../../app/js/Features/Authentication/AuthenticationController.js"
diff --git a/services/web/test/unit/coffee/Project/ProjectCollabratecDetailsTest.coffee b/services/web/test/unit/coffee/Project/ProjectCollabratecDetailsTest.coffee
index 6d9e4be79e..4f2fe59c16 100644
--- a/services/web/test/unit/coffee/Project/ProjectCollabratecDetailsTest.coffee
+++ b/services/web/test/unit/coffee/Project/ProjectCollabratecDetailsTest.coffee
@@ -4,9 +4,7 @@ SandboxedModule = require "sandboxed-module"
 assert = require "assert"
 chai = require "chai"
 sinon = require "sinon"
-sinonChai = require "sinon-chai"
 
-chai.use sinonChai
 expect = chai.expect
 
 modulePath = Path.join __dirname, "../../../../app/js/Features/Project/ProjectCollabratecDetailsHandler"
diff --git a/services/web/test/unit/coffee/Templates/TemplatesControllerTests.coffee b/services/web/test/unit/coffee/Templates/TemplatesControllerTests.coffee
index 1f45251e2d..78344ca083 100644
--- a/services/web/test/unit/coffee/Templates/TemplatesControllerTests.coffee
+++ b/services/web/test/unit/coffee/Templates/TemplatesControllerTests.coffee
@@ -2,10 +2,8 @@ SandboxedModule = require('sandboxed-module')
 assert = require('assert')
 chai = require('chai')
 sinon = require('sinon')
-sinonChai = require('sinon-chai')
 
 chai.should()
-chai.use(sinonChai)
 expect = chai.expect
 
 modulePath = '../../../../app/js/Features/Templates/TemplatesController'
diff --git a/services/web/test/unit/coffee/Templates/TemplatesManagerTests.coffee b/services/web/test/unit/coffee/Templates/TemplatesManagerTests.coffee
index 2b9d636640..dcebb2454e 100644
--- a/services/web/test/unit/coffee/Templates/TemplatesManagerTests.coffee
+++ b/services/web/test/unit/coffee/Templates/TemplatesManagerTests.coffee
@@ -2,10 +2,8 @@ SandboxedModule = require('sandboxed-module')
 assert = require('assert')
 chai = require('chai')
 sinon = require('sinon')
-sinonChai = require('sinon-chai')
 
 should = require('chai').should()
-chai.use(sinonChai)
 
 modulePath = '../../../../app/js/Features/Templates/TemplatesManager'