diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 24f23def..b3eb1166 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -21,6 +21,8 @@ module.exports = (grunt) ->
     mochaTest:
       test:
         src: ['test/**/*.js']
+      options:
+        timeout: 0
     jshint:
       all: ['bin/embark', 'lib/**/*.js', 'js/mine.js', 'js/embark.js']
 
diff --git a/test/compiler.js b/test/compiler.js
index 806da7ae..19c05843 100644
--- a/test/compiler.js
+++ b/test/compiler.js
@@ -12,7 +12,6 @@ describe('embark.Compiler', function() {
   var compiler = new Compiler({logger: new TestLogger({})});
 
   describe('#compile_solidity', function() {
-    this.timeout(15000);
 
     var expectedObject = {};
 
diff --git a/test/contracts.js b/test/contracts.js
index 58a7b053..57b65bcf 100644
--- a/test/contracts.js
+++ b/test/contracts.js
@@ -9,7 +9,6 @@ var readFile = function(file) {
 };
 
 describe('embark.Contratcs', function() {
-  this.timeout(15000);
 
   describe('simple', function() {
     var contractsManager = new ContractsManager({