diff --git a/.gitignore b/.gitignore
index f1713db..adbb218 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 *~
 *.tar.gz
 *.patch
+.tox
 tags
diff --git a/.travis.yml b/.travis.yml
index c3b58e6..f04fa15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,17 @@
 language: python
 
-python:
-  - 2.6
-  - 2.7
-  - 3.2
-  - 3.3
-  - 3.4
+python: 2.7
+
+env:
+  - TOX_ENV=py26
+  - TOX_ENV=py27
+  - TOX_ENV=py32
+  - TOX_ENV=py33
+  - TOX_ENV=py34
+  - TOX_ENV=flake8
 
 install:
-  - pip install --use-mirrors pytest
+  - pip install tox
 
 script:
-  - make test
+  - tox -e $TOX_ENV
diff --git a/Makefile b/Makefile
index 0d8af9d..a357f26 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ docs:
 	pandoc -s -w markdown docs/header.md docs/install.md docs/body.md -o README.md
 
 lint:
-	@flake8 ./ --config=setup.cfg
+	@flake8 ./ --config=tox.ini
 
 release: docs
 	# Check for tag existence
@@ -38,6 +38,6 @@ tar:
 	git archive --format=tar --prefix autojump_v$(VERSION)/ $(TAGNAME) | gzip > autojump_v$(VERSION).tar.gz
 	sha1sum autojump_v$(VERSION).tar.gz
 
-test:
+test: lint
 	@find . -type f -iname "*.pyc" -delete
-	py.test -rsxX -q
+	tox
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 817c7a4..2c84e24 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,3 +1,4 @@
-flake8>=2.0.0
+flake8
 mock
 pytest
+tox
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index f917c4a..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[flake8]
-filename = *.py,autojump
-ignore = E126,E128
-max-line-length = 79
-max-complexity = 10
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..971d67a
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,32 @@
+[tox]
+envlist =
+	py26,
+	py27,
+	py32,
+	py33,
+	py34
+# ignore missing setup.py
+skipsdist = True
+
+[testenv]
+deps = -rdev-requirements.txt
+commands = py.test -rsxX -q
+
+[testenv:flake8]
+deps = flake8
+commands = flake8 .
+
+[flake8]
+filename =
+	*.py,
+	autojump
+ignore =
+	E126,
+	E128
+max-line-length = 79
+max-complexity = 10
+show-pep8 = True
+
+[pytest]
+addopts = -rsxX -q
+norecursedirs = .git .tox docs