diff --git a/test/mocha.opts b/test/mocha.opts
index 880fa5702..340b32449 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -3,6 +3,6 @@
 --ui tdd
 --timeout 10000
 --slow 600
-test/server-test.js
 test/websocket-test.js
+test/server-test.js
 test/*-test.{js,coffee}
\ No newline at end of file
diff --git a/test/websocket-test.js b/test/websocket-test.js
index f24d34715..d50557811 100644
--- a/test/websocket-test.js
+++ b/test/websocket-test.js
@@ -9,6 +9,8 @@ suite('WebSocket connection', function() {
   var server;
 
   setup(function(done) {
+    this.timeout(1000);
+
     var cfg = extend({}, config.default_server_config, config.servers.alpha);
     if (cfg.no_server) {
       done();
@@ -20,6 +22,8 @@ suite('WebSocket connection', function() {
   });
 
   teardown(function(done) {
+    this.timeout(1000);
+    
     if (config.servers.alpha.no_server) {
       done();
     } else {
@@ -29,6 +33,8 @@ suite('WebSocket connection', function() {
   });
 
   test('WebSocket connect and disconnect', function(done) {
+    this.timeout(1000);
+
     var alpha = Remote.from_config("alpha");
 
     alpha.on('connected', function () {