diff --git a/test/mocha.opts b/test/mocha.opts
index fdc70aba73..77a7a3544f 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1 +1,5 @@
---reporter spec --compilers coffee:coffee-script  --ui tdd --timeout 10000 --slow 600
\ No newline at end of file
+--reporter spec
+--compilers coffee:coffee-script
+--ui tdd
+--timeout 10000
+--slow 600
\ No newline at end of file
diff --git a/test/runall.sh b/test/runall.sh
index a83f80ff61..2e31c8d2f4 100755
--- a/test/runall.sh
+++ b/test/runall.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 
 # flags set in mocha.opts
-mocha test/*-test.{js,coffee}
-
+mocha test/*-test.{js,coffee}
\ No newline at end of file
diff --git a/test/websocket-test.js b/test/websocket-test.js
index d0070700f9..f24d34715d 100644
--- a/test/websocket-test.js
+++ b/test/websocket-test.js
@@ -28,7 +28,7 @@ suite('WebSocket connection', function() {
     }
   });
 
-  test('WebSocket connect and disconnect', function() {
+  test('WebSocket connect and disconnect', function(done) {
     var alpha = Remote.from_config("alpha");
 
     alpha.on('connected', function () {