diff --git a/.travis.yml b/.travis.yml
index 12bc119..d1cdaab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,16 @@ env:
   - DJANGOVER=django17
   - DJANGOVER=django18
   - DJANGOVER=django19
+  - CLIENT_TESTS=1
 
 matrix:
   exclude:
     - python: 3.5
       env: DJANGOVER=django17
+    - python: 2.7
+      env: CLIENT_TESTS=1
+    - python: 3.4
+      env: CLIENT_TESTS=1
 
 install:
   - pip install tox
@@ -21,7 +26,8 @@ install:
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+  - sleep 3
 
 script:
-  - export TOX_ENV=py${TRAVIS_PYTHON_VERSION/./}-${DJANGOVER}
+  - "if [[ $CLIENT_TESTS == '1' ]]; then export TOX_ENV=client-tests; else export TOX_ENV=py${TRAVIS_PYTHON_VERSION/./}-${DJANGOVER}; fi"
   - tox -r -e "$TOX_ENV"
diff --git a/client/karma.conf.js b/client/karma.conf.js
index 8a14d9a..886f28a 100644
--- a/client/karma.conf.js
+++ b/client/karma.conf.js
@@ -39,7 +39,7 @@ module.exports = function(config) {
 		// - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`)
 		// - PhantomJS
 		// - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
-		browsers: ['ChromeCanary'],
+		browsers: ['Firefox'],
 
 		// If browser does not capture in given timeout [ms], kill it
 		captureTimeout: 60000,
diff --git a/tox.ini b/tox.ini
index 1fb69f4..1aee20e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = coverage-clean, py{27,34,35}-django{18,19}, py{27,34}-django17, coverage-report
+envlist = client-tests, coverage-clean, py{27,34,35}-django{18,19}, py{27,34}-django17, coverage-report
 skipsdist = true
 
 [testenv]
@@ -36,7 +36,9 @@ whitelist_externals =
     coverage
 
 [testenv:client-tests]
+changedir = {toxinidir}/client
 commands =
-    cd client
     npm install
     npm run test-single-run
+whitelist_externals =
+    npm