diff --git a/.travis.yml b/.travis.yml
index 69b6b5446e..d661ea73c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 language: node_js
 node_js:
 - "0.10"
+before_script:
+- echo '--timeout 10000' > test/mocha.opts
 script:
 - npm install
 - npm test
diff --git a/package.json b/package.json
index 4c3bedfd66..dde99953f1 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
         "start": "NODE_ENV=production node server.js",
         "build": "./node_modules/.bin/webpack",
         "dev": "NODE_ENV=development supervisor --ignore ./node_modules/,./public/js server.js",
-        "test": "jshint server.js lib test && jsxhint public/js/**/*.jsx && mocha test test/* && npm run coverage",
+        "test": "jshint server.js lib test && jsxhint public/js/**/*.jsx && mocha test test/*.js && npm run coverage",
         "tdd": "mocha --watch test test/*",
         "test-bamboo-ci": "mocha test test/*",
         "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec",