diff --git a/.travis.yml b/.travis.yml
index 0538da4..37c5317 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,15 @@
-# manual (marker for update script)
 language: python
 sudo: false
-env:
-    - TOXENV=py27
-    - TOXENV=py33
-    - TOXENV=py34
-    - TOXENV=pypy
+python:
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
+  - pypy
+  - pypy3
 install:
-    - travis_retry pip install tox
+  - pip install tox-travis
 script:
-    - tox
+  - tox
 notifications:
     email: false
diff --git a/CHANGES.rst b/CHANGES.rst
index 0abe007..df7baa0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,8 @@ Changes
 4.2.0 (unreleased)
 ------------------
 
+- Add support for Python 3.5.
+
 - Drop support for Python 2.6.
 
 
diff --git a/setup.py b/setup.py
index 2cd6b56..8a83c6e 100644
--- a/setup.py
+++ b/setup.py
@@ -44,6 +44,7 @@ def read(*rnames):
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.3',
           'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Natural Language :: English',
diff --git a/tox.ini b/tox.ini
index 4663f6e..b1f2de2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 envlist =
-    py27,py33,py34,pypy
+    py27,py33,py34,py35,pypy
 
 [testenv]
 commands =
-    python setup.py test -q
+    python setup.py -q test -q
 deps =
     ZODB
     persistent