diff --git a/test/05-device-state.spec.coffee b/test/05-device-state.spec.coffee
index cf15a981..0eba0197 100644
--- a/test/05-device-state.spec.coffee
+++ b/test/05-device-state.spec.coffee
@@ -192,7 +192,6 @@ testTargetInvalid = {
 
 describe 'deviceState', ->
 	before ->
-		@timeout(5000)
 		prepare()
 		@db = new DB()
 		@config = new Config({ @db })
diff --git a/test/11-api-binder.spec.coffee b/test/11-api-binder.spec.coffee
index cc047ac8..d7cafb96 100644
--- a/test/11-api-binder.spec.coffee
+++ b/test/11-api-binder.spec.coffee
@@ -13,7 +13,6 @@ DeviceState = require('../src/device-state')
 APIBinder = require('../src/api-binder')
 
 initModels = (filename) ->
-	@timeout(5000)
 	prepare()
 	@db = new DB()
 	@config = new Config({ @db, configPath: filename })
diff --git a/test/13-device-config.spec.coffee b/test/13-device-config.spec.coffee
index 40def1c6..0a3083f4 100644
--- a/test/13-device-config.spec.coffee
+++ b/test/13-device-config.spec.coffee
@@ -18,7 +18,6 @@ childProcess = require 'child_process'
 
 describe 'DeviceConfig', ->
 	before ->
-		@timeout(5000)
 		prepare()
 		@fakeDB = {}
 		@fakeConfig = {
diff --git a/test/14-application-manager.spec.coffee b/test/14-application-manager.spec.coffee
index 523d44c1..38ed6652 100644
--- a/test/14-application-manager.spec.coffee
+++ b/test/14-application-manager.spec.coffee
@@ -117,7 +117,6 @@ dependentDBFormat = {
 
 describe 'ApplicationManager', ->
 	before ->
-		@timeout(5000)
 		prepare()
 		@db = new DB()
 		@config = new Config({ @db })
diff --git a/test/mocha.opts b/test/mocha.opts
index ca6014e9..c7475596 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,2 +1,3 @@
 --exit
+--timeout 30000
 build/test/*.js