diff --git a/.travis.yml b/.travis.yml
index 432cf21..38324ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,8 @@
     env: TOXENV=py34
   - python: "3.5"
     env: TOXENV=py35
+  - python: "3.6"
+    env: TOXENV=py36
   - python: "pypy"
     env: TOXENV=pypy
 
@@ -43,6 +45,8 @@
     env: TOXENV=py34-cryptographyMaster
   - python: "3.5"
     env: TOXENV=py35-cryptographyMaster
+  - python: "3.6"
+    env: TOXENV=py36-cryptographyMaster
   - python: "pypy"
     env: TOXENV=pypy-cryptographyMaster
 
@@ -57,6 +61,8 @@
     env: TOXENV=py34-cryptographyMinimum
   - python: "3.5"
     env: TOXENV=py35-cryptographyMinimum
+  - python: "3.6"
+    env: TOXENV=py36-cryptographyMinimum
   - python: "pypy"
     env: TOXENV=pypy-cryptographyMinimum
 
@@ -89,6 +95,7 @@
   - env: TOXENV=py33-cryptographyMaster
   - env: TOXENV=py34-cryptographyMaster
   - env: TOXENV=py35-cryptographyMaster
+  - env: TOXENV=py36-cryptographyMaster
   - env: TOXENV=pypy-cryptographyMaster
 
 install:
diff --git a/MANIFEST.in b/MANIFEST.in
index 72b419c..60b7c88 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,11 @@
 include             LICENSE MANIFEST.in *.rst tox.ini docs-requirements.txt .coveragerc
 exclude             leakcheck
-recursive-include   tests       *.py
-recursive-include   doc         *
-recursive-include   examples    *
-recursive-include   rpm         *
-recursive-exclude   leakcheck   *.py *.pem
+recursive-include   tests           *.py
+recursive-include   doc             *
+recursive-include   examples        *
+recursive-include   rpm             *
+recursive-exclude   leakcheck       *.py *.pem
+recursive-exclude   examples/simple *.cert *.pkey
 prune               doc/_build
 prune               .travis
 prune               .mention-bot
diff --git a/setup.py b/setup.py
index de510f3..97aa209 100755
--- a/setup.py
+++ b/setup.py
@@ -83,6 +83,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',
diff --git a/tox.ini b/tox.ini
index 9dfb232..5098d6f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster,-cryptographyMinimum},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report
+envlist = {pypy,py26,py27,py33,py34,py35,py36}{,-cryptographyMaster,-cryptographyMinimum},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report
 
 [testenv]
 whitelist_externals =