diff --git a/tox.ini b/tox.ini
index ee3c6093..cdb258fa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,py27
+envlist = py27,pep8,npm-test,npm-lint
 minversion = 1.6
 skipsdist = True
 
@@ -36,3 +36,9 @@ commands = python setup.py testr --coverage {posargs}
 ignore = E125,E123,E129,H404,H405
 show-source = True
 exclude = .git,.venv,.tox,dist,doc,openstack,*egg
+
+[testenv:npm-test]
+commands = npm test
+
+[testenv:npm-lint]
+commands = npm run lint --silent