diff --git a/.travis.yml b/.travis.yml
index f000d5e..4847904 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,12 @@ python:
     - 2.7
     - 3.3
     - 3.4
+    - 3.5
     - pypy
     - pypy3
 install:
     - pip install .
 script:
-    - python setup.py test -q
+    - python setup.py -q test -q
 notifications:
     email: false
diff --git a/CHANGES.rst b/CHANGES.rst
index 66aafe4..854b30e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,8 @@ Changes
 2.2.0 (unreleased)
 ------------------
 
+- Add support for Python 3.5.
+
 - Drop support for Python 2.6.
 
 - Bring unit test coverage to 100% (including branches).
diff --git a/setup.py b/setup.py
index 2d3f6f0..eee622e 100644
--- a/setup.py
+++ b/setup.py
@@ -55,6 +55,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',
         'Topic :: Internet :: WWW/HTTP',
diff --git a/tox.ini b/tox.ini
index fa1a900..42a2e5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ envlist =
 
 [testenv]
 commands =
-    python setup.py test -q
+    python setup.py -q test -q
 # without explicit deps, setup.py test will download a bunch of eggs into $PWD
 # (and it seems I can't use zope.dottedname[testing] here, so forget DRY)
 deps =