diff --git a/.travis.yml b/.travis.yml
index 4847904..19c2e15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
     - 3.3
     - 3.4
     - 3.5
+    - 3.6
     - pypy
     - pypy3
 install:
diff --git a/CHANGES.rst b/CHANGES.rst
index d33d570..8a1c70d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,7 +8,7 @@
 
 - Add support for Jython 2.7.
 
-- Add support for Python 3.5.
+- Add support for Python 3.5 and 3.6.
 
 0.6.0 (2015-04-02)
 ------------------
diff --git a/setup.py b/setup.py
index 38cb65d..4422e4c 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@
         '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',
         'Programming Language :: Python :: Implementation :: Jython',
@@ -69,19 +70,19 @@
         'Operating System :: Microsoft :: Windows',
         'Operating System :: Unix',
         'Operating System :: MacOS :: MacOS X',
-        ],
+    ],
     platforms=['any'],
     packages=find_packages('src'),
-    package_dir = {'':'src'},
-    ext_modules = ext_modules,
-    extras_require = {
-        'test': (),
+    package_dir={'': 'src'},
+    ext_modules=ext_modules,
+    extras_require={
+        'test': [],
         'testing': ['nose', 'coverage'],
-        },
+    },
     test_suite='zodbpickle.tests.test_pickle.test_suite',
     install_requires=[
         'setuptools',
-        ],
+    ],
     include_package_data=True,
-    zip_safe=False
-    )
+    zip_safe=False,
+)
diff --git a/tox.ini b/tox.ini
index 8637463..c9a52ea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 # Jython 2.7rc2 does work, but unfortunately has an issue running
 # with Tox 1.9.2 (http://bugs.jython.org/issue2325)
-envlist = py27,py33,py34,py35,pypy,pypy3
+envlist = py27,py33,py34,py35,py36,pypy,pypy3
 
 [testenv]
 deps =
@@ -14,7 +14,7 @@ commands =
 
 [testenv:coverage]
 basepython =
-    python3.3
+    python3
 commands =
     nosetests --with-xunit --with-xcoverage --no-skip zodbpickle.tests.test_pickle zodbpickle.tests.test_pickle_3
 deps =