diff --git a/requirements-test.txt b/requirements-test.txt
index d75fffe..c8bfd85 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,6 +1,4 @@
-django>=1.5.1
 py-moneyed==0.5.0
-coverage
 mock>=1.0.1
 nose>=1.3.0
 django-nose>=1.2
diff --git a/tox.ini b/tox.ini
index 7fec635..831b740 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,40 @@
 [tox]
-envlist = py27, py33
+envlist =
+    py27-django{18,19,110,master},
+    py32-django18,
+    py33-django18,
+    py34-django{18,19,110,master},
+    py35-django{18,19,110,master},
+    flake8
 
 [testenv]
+deps =
+    django18: Django==1.8.16
+    django19: Django==1.9.11
+    django110: Django==1.10.3
+    djangomaster: https://github.com/django/django/archive/master.tar.gz
+    coverage==4.1
+    pytest-cov==2.3.0
+    -rrequirements-test.txt
+
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/djmoney_rates
 commands =
     coverage run -a runtests.py
+
+[testenv:py32-django18]
+# coverage-4.1 doesn't support python-3.2.
+commands=python runtests.py
 deps =
-    -r{toxinidir}/requirements-test.txt
\ No newline at end of file
+    django18: Django==1.8.16
+    -rrequirements/testing.txt
+
+[testenv:flake8]
+deps =
+    flake8
+commands =
+    flake8 djmoney_rates
+
+[flake8]
+max-line-length = 120
+exclude = docs,.tox