diff --git a/Makefile b/Makefile
index 34f9030cb34..b3748228830 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ all: test
 
 coverage:
 	NODE_ENV=test ${MONGO_SETTINGS} \
-	${ISTANBUL} cover ${MOCHA} -- --timeout 30000 -R tap ${TESTS}
+	${ISTANBUL} cover ${MOCHA} -- --timeout 15000 -R tap ${TESTS}
 
 report:
 	test -f ${ANALYZED} && \
@@ -45,7 +45,7 @@ test:
 
 travis:
 	NODE_ENV=test ${MONGO_SETTINGS} \
-	${ISTANBUL} cover ${MOCHA} --report lcovonly -- --timeout 50000 -R tap ${TESTS}
+	${ISTANBUL} cover ${MOCHA} --report lcovonly -- --timeout 5000 -R tap ${TESTS}
 
 docker_release:
 	# Get the version from the package.json file
diff --git a/package-lock.json b/package-lock.json
index 8d5d2826986..e79a9001456 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -173,15 +173,6 @@
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
     },
-    "ascli": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
-      "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
-      "requires": {
-        "colour": "0.7.1",
-        "optjs": "3.2.2"
-      }
-    },
     "asn1": {
       "version": "0.1.11",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
@@ -2281,11 +2272,18 @@
       "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
       "dev": true,
       "requires": {
+        "async": "1.5.2",
         "optimist": "0.5.2",
         "source-map": "0.1.43",
         "uglify-js": "2.8.29"
       },
       "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
         "uglify-js": {
           "version": "2.8.29",
           "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
@@ -2746,6 +2744,7 @@
       "dev": true,
       "requires": {
         "abbrev": "1.0.9",
+        "async": "1.5.2",
         "escodegen": "0.0.15",
         "esprima": "1.0.2",
         "glob": "7.1.2",
@@ -2758,6 +2757,14 @@
         "supports-color": "2.0.0",
         "which": "1.2.14",
         "wordwrap": "0.0.3"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        }
       }
     },
     "joi": {
@@ -3308,6 +3315,11 @@
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
           "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
         },
+        "node-uuid": {
+          "version": "1.4.8",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
+        },
         "qs": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz",
@@ -3566,11 +3578,6 @@
         }
       }
     },
-    "node-uuid": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-      "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
-    },
     "nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -4496,6 +4503,17 @@
       "requires": {
         "ascli": "1.0.1",
         "bytebuffer": "3.1.1"
+      },
+      "dependencies": {
+        "ascli": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
+          "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
+          "requires": {
+            "colour": "0.7.1",
+            "optjs": "3.2.2"
+          }
+        }
       }
     },
     "proxy-addr": {
@@ -5284,6 +5302,11 @@
             "mime-db": "1.12.0"
           }
         },
+        "node-uuid": {
+          "version": "1.4.8",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
+        },
         "oauth-sign": {
           "version": "0.6.0",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz",
diff --git a/tests/admintools.test.js b/tests/admintools.test.js
index a2374ff1ff2..f1851010bb1 100644
--- a/tests/admintools.test.js
+++ b/tests/admintools.test.js
@@ -57,7 +57,7 @@ var someData = {
 
 describe('admintools', function ( ) {
   var self = this;
-  this.timeout(30000);
+  this.timeout(30000); // TODO: see why this test takes longer on Travis to complete
   before(function (done) {
     benv.setup(function() {
 
diff --git a/tests/careportal.test.js b/tests/careportal.test.js
index 1241ebe703a..782bc4fa566 100644
--- a/tests/careportal.test.js
+++ b/tests/careportal.test.js
@@ -13,6 +13,8 @@ var nowData = {
 };
 
 describe('client', function ( ) {
+  this.timeout(30000); // TODO: see why this test takes longer on Travis to complete
+
   var self = this;
 
   var headless = require('./fixtures/headless')(benv, this);
diff --git a/tests/hashauth.test.js b/tests/hashauth.test.js
index 21f249a57a7..19fb50cc69e 100644
--- a/tests/hashauth.test.js
+++ b/tests/hashauth.test.js
@@ -6,6 +6,8 @@ var read = require('fs').readFileSync;
 var serverSettings = require('./fixtures/default-server-settings');
 
 describe('hashauth', function ( ) {
+  this.timeout(40000); // TODO: see why this test takes longer on Travis to complete
+
   var self = this;
   var headless = require('./fixtures/headless')(benv, this);
 
@@ -63,7 +65,6 @@ describe('hashauth', function ( ) {
   */
 
   it ('should make module unauthorized', function () {
-     this.timeout(50000);
     var client = require('../lib/client');
     var hashauth = require('../lib/hashauth');
     
@@ -82,7 +83,6 @@ describe('hashauth', function ( ) {
   });
 
   it ('should make module authorized', function () {
-    this.timeout(50000);
     var client = require('../lib/client');
     var hashauth = require('../lib/hashauth');
     
@@ -99,9 +99,6 @@ describe('hashauth', function ( ) {
   });
 
   it ('should store hash and the remove authentication', function () {
-
-    this.timeout(50000);
-
     var client = require('../lib/client');
     var hashauth = require('../lib/hashauth');
     var localStorage = require('./fixtures/localstorage');   
diff --git a/tests/pluginbase.test.js b/tests/pluginbase.test.js
index c04f0c802ce..d80a328648e 100644
--- a/tests/pluginbase.test.js
+++ b/tests/pluginbase.test.js
@@ -4,6 +4,8 @@ require('should');
 var benv = require('benv');
 
 describe('pluginbase', function ( ) {
+  this.timeout(40000); // TODO: see why this test takes longer on Travis to complete
+
   var headless = require('./fixtures/headless')(benv, this);
 
   before(function (done) {
diff --git a/tests/profileeditor.test.js b/tests/profileeditor.test.js
index 4791b139544..9c915027c84 100644
--- a/tests/profileeditor.test.js
+++ b/tests/profileeditor.test.js
@@ -71,7 +71,7 @@ var someData = {
 
 
 describe('Profile editor', function ( ) {
-  this.timeout(30000);
+  this.timeout(40000); //TODO: see why this test takes longer on Travis to complete
   var headless = require('./fixtures/headless')(benv, this);
 
   before(function (done) {