diff --git a/.travis.yml b/.travis.yml
index 0fa7cb2..ca07bf1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,27 @@
 language: python
-python:
-  - "2.7"
+python: 3.5
+sudo: false
+cache:
+  directories:
+  - "~/.cache/pip"
 env:
-  - TOX_ENV=py27-django18
-  - TOX_ENV=py33-django18
+  matrix:
+  - TOXENV=py27-dj18
+  - TOXENV=py33-dj18
+  - TOXENV=py34-dj18
+  - TOXENV=py35-dj18
 install:
-  - pip install tox
-notifications:
-  email:
-    - jason.louard.ward@gmail.com
-script: tox -e $TOX_ENV
+- pip install tox codecov
+script: tox -v
+after_success:
+- codecov
+deploy:
+  provider: pypi
+  user: jazzband
+  distributions: sdist bdist_wheel
+  password:
+    secure: XoXuSeFfJ+cM5/eCAAVuT6E/KsvuvMl9u9On5id6miq+wYqftpWiN9e/fjb3pDWkfZITooPeJBTpMJBGu+2Yc5i8JVGsYQgvP9dFqOH14P6NV4JU1ZF8iP7dpdWX3+h3K/QnqTvwwHmRF3mrDd/lnN9AB74bXLFYS282glJLVKM=
+  on:
+    tags: true
+    condition: "$TOXENV = py27-dj18"
+    repo: jazzband/django-authority
diff --git a/tox.ini b/tox.ini
index c90cfc0..5d855e2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,17 @@
 [tox]
+skipsdist = True
+usedevelop = True
+minversion = 1.8
 envlist =
-    py27-django{14,15,16,17,18},
-    py33-django{15,16,17,18}
+    py{27,33,34,35}-dj18
 
 [testenv]
+basepython =
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+    py35: python3.5
+usedevelop = true
 commands = python example/manage.py test authority
 deps =
-    django18: Django>=1.8, <1.9
+    dj18: Django<1.9