diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..af40312
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,6 @@
+[run]
+source = src
+
+[report]
+exclude_lines =
+    pragma: no cover
diff --git a/.travis.yml b/.travis.yml
index 4847904..74929ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,18 @@ python:
     - 3.3
     - 3.4
     - 3.5
-    - pypy
-    - pypy3
+    - 3.6
+    - pypy-5.4.1
 install:
-    - pip install .
+    - pip install -U pip setuptools
+    - pip install -U coverage coveralls
+    - pip install -U -e .[test]
 script:
-    - python setup.py -q test -q
+    - zope-testrunner --test-path=src
 notifications:
     email: false
+cache: pip
+before_cache:
+    - rm -f $HOME/.cache/pip/log/debug.log
+after_success:
+  - coveralls
diff --git a/CHANGES.rst b/CHANGES.rst
index ffd977c..864f6ac 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,7 @@
 4.1.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Add support for Python 3.6.
 
 
 4.1.0 (2017-04-12)
diff --git a/MANIFEST.in b/MANIFEST.in
index 3bf321e..458f55e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
 include *.rst
 include *.txt
+include .coveragerc
 
 recursive-include docs *
 recursive-include src *
diff --git a/setup.cfg b/setup.cfg
index 1e568c7..2bece89 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,3 +8,6 @@ where=src
 [aliases]
 dev = develop easy_install zope.exceptions[testing]
 docs = easy_install zope.exceptions[docs]
+
+[bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
index f0f610b..bc2e2d0 100644
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,10 @@ def alltests():
     suites = list(zope.testrunner.find.find_suites(options))
     return unittest.TestSuite(suites)
 
+tests_require = [
+    'zope.testrunner',
+]
+
 setup(name='zope.exceptions',
       version='4.1.1.dev0',
       author='Zope Foundation and Contributors',
@@ -47,8 +51,8 @@ def alltests():
       description='Zope Exceptions',
       long_description=(read('README.rst') + '\n\n' +
                         read('CHANGES.rst')),
-      keywords = 'zope exceptions',
-      classifiers = [
+      keywords='zope exceptions',
+      classifiers=[
           'Development Status :: 5 - Production/Stable',
           'Environment :: Web Environment',
           'Intended Audience :: Developers',
@@ -60,28 +64,32 @@ def alltests():
           'Programming Language :: Python :: 3.3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
           "Programming Language :: Python :: Implementation :: CPython",
           "Programming Language :: Python :: Implementation :: PyPy",
           'Natural Language :: English',
           'Operating System :: OS Independent',
           'Topic :: Internet :: WWW/HTTP',
-          'Framework :: Zope3'],
+          'Framework :: Zope3',
+      ],
       url='http://cheeseshop.python.org/pypi/zope.exceptions',
       license='ZPL 2.1',
       packages=find_packages('src'),
-      package_dir = {'': 'src'},
+      package_dir={'': 'src'},
       namespace_packages=['zope'],
-      install_requires=['setuptools',
-                        'zope.interface',
-                       ],
-      tests_require = [
+      install_requires=[
+          'setuptools',
+          'zope.interface',
+      ],
+      tests_require=[
           'zope.testrunner',
-          ],
-      test_suite = '__main__.alltests',
-      include_package_data = True,
-      zip_safe = False,
-      extras_require = {
-        'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
-        'testing': ['nose', 'coverage'],
+      ],
+      test_suite='__main__.alltests',
+      include_package_data=True,
+      zip_safe=False,
+      extras_require={
+          'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
+          'testing': ['nose', 'coverage'],
+          'test': tests_require,
       },
 )
diff --git a/tox.ini b/tox.ini
index f621f2f..ce87117 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,12 @@
 [tox]
 envlist =
-    py27,py33,py34,py35,pypy,pypy3,coverage,docs
+    py27,py33,py34,py35,py36,pypy,pypy3,coverage,docs
 
 [testenv]
 commands =
-    python setup.py -q test -q
+    zope-testrunner --test-path=src []
 deps =
-    zope.interface
-    zope.testrunner
+    .[test]
 
 [testenv:coverage]
 usedevelop = true
@@ -16,9 +15,7 @@ basepython =
 commands =
     nosetests --with-xunit --with-xcoverage
 deps =
-    zope.interface
-    nose
-    coverage
+    .[test,testing]
     nosexcover
 
 [testenv:docs]
@@ -28,6 +25,4 @@ commands =
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
     sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest
 deps =
-    zope.interface
-    Sphinx
-    repoze.sphinx.autointerface
+     .[test,docs]