diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index c04e8057..cd2e8e0b 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -29,7 +29,7 @@ build:
             - 'pip install coverage --force-reinstall -U'
         override:
             -
-                command: python3 -m pytest --cov=psqlextra
+                command: tox
                 coverage:
                     file: '.coverage'
                     format: 'py-cc'
diff --git a/README.rst b/README.rst
index d137b0b7..64c5de04 100644
--- a/README.rst
+++ b/README.rst
@@ -166,7 +166,7 @@ Working with the code
 
    .. code-block:: bash
     
-       λ py.test
+       λ tox
     
 5. Run the benchmarks:
 
diff --git a/requirements/analysis.txt b/requirements/analysis.txt
index 7a590542..643dfe6a 100644
--- a/requirements/analysis.txt
+++ b/requirements/analysis.txt
@@ -1,5 +1,6 @@
 # pylint
 pylint-celery==0.3
-pylint-common==0.2.2
-pylint-django==0.7.2
-pylint-plugin-utils==0.2.4
+pylint-common==0.2.5
+pylint-django==0.8.0
+pylint-plugin-utils==0.2.6
+
diff --git a/requirements/base.txt b/requirements/base.txt
index c19650b9..4c57267c 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1 +1,2 @@
-enforce==0.3.2
+enforce==0.3.4
+
diff --git a/requirements/test.txt b/requirements/test.txt
index 0575b1c7..e95e56a7 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,19 +1,17 @@
 -r base.txt
 
-coverage==4.2
-Django==1.11.1
-django-coverage-plugin==1.3.1
 psycopg2==2.7.3.2
-pylint==1.6.4
-pylint-common==0.2.2
-pylint-django==0.7.2
-pylint-plugin-utils==0.2.4
-coverage==4.2
+pylint==1.8.1
+pylint-common==0.2.5
+pylint-django==0.8.0
+pylint-plugin-utils==0.2.6
+coverage==4.4.2
 django-coverage-plugin==1.3.1
-flake8==3.0.4
-pep8==1.7.0
-dj-database-url==0.4.1
-pytest==3.0.6
-pytest-benchmark==3.0.0
+flake8==3.5.0
+pep8==1.7.1
+dj-database-url==0.4.2
+pytest==3.3.2
+pytest-benchmark==3.1.1
 pytest-django==3.1.2
-pytest-cov==2.4.0
+pytest-cov==2.5.1
+tox==2.9.1
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..1fa12671
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+[tox]
+envlist = py35-dj{111,20}
+
+[testenv]
+deps =
+    dj111: Django>=1.11,<1.12
+    dj20: Django>=2.0,<2.1
+    -rrequirements/test.txt
+setenv =
+    DJANGO_SETTINGS_MODULE=settings
+passenv = DATABASE_URL
+commands = python -m pytest --cov=psqlextra