diff --git a/.travis.yml b/.travis.yml
index 202e6df26f7..07c577b414c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
 language: python
-python:
-  - "2.7"
-  - "2.6"
+python: 2.7
+env:
+  - TOX_ENV=py27-lint
+  - TOX_ENV=py26-lint
+  - TOX_ENV=py27-unit
+  - TOX_ENV=py26-unit
+
 install:
-  - virtualenv .venv
-  - . .venv/bin/activate
-  - pip install flake8
-script: ./.ci/flake8_wrapper.sh && ./run_tests.sh -u
+  - pip install tox
+
+script: tox -e $TOX_ENV
+
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000000..7f5b9654ac4
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,22 @@
+[tox]
+envlist = py27-lint, py26-lint, py27-unit, py26-unit
+skipsdist = True
+
+[testenv:py27-lint]
+commands = bash .ci/flake8_wrapper.sh
+whitelist_externals = bash
+deps = flake8
+
+[testenv:py26-lint]
+commands = bash .ci/flake8_wrapper.sh
+whitelist_externals = bash
+deps = flake8
+
+[testenv:py27-unit]
+commands = bash run_tests.sh -u
+whitelist_externals = bash
+
+[testenv:py26-unit]
+commands = bash run_tests.sh -u
+whitelist_externals = bash
+