diff --git a/.travis.yml b/.travis.yml
index 633becbe..0082ac4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,10 @@
+# config file for automatic testing at travis-ci.org
 language: python
+cache: pip
 install:
   - pip install --upgrade pip setuptools
-  - pip install virtualenv
-script: python setup.py test
+  - pip install virtualenv tox
+script: tox -v
 matrix:
   include:
   - python: "2.7"
diff --git a/tox.ini b/tox.ini
index e172f8a1..33b60895 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist =
     pypy
 
 [testenv]
-commands = py.test
+commands = pytest {posargs:}
 deps =
     pytest
     pytest-cov