diff --git a/.gitignore b/.gitignore
index 7b183797f..11e37b7af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ doc/_build/
 .eggs
 examples/simple/*.cert
 examples/simple/*.pkey
+.cache
diff --git a/.travis.yml b/.travis.yml
index cf244a6f0..fd87a9ba6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,8 @@ matrix:
     env: TOXENV=py33
   - python: "3.4"
     env: TOXENV=py34
+  - python: "3.5"
+    env: TOXENV=py35
   - python: "pypy"
     env: TOXENV=pypy
 
@@ -38,6 +40,8 @@ matrix:
     env: TOXENV=py33-cryptographyMaster
   - python: "3.4"
     env: TOXENV=py34-cryptographyMaster
+  - python: "3.5"
+    env: TOXENV=py35-cryptographyMaster
   - python: "pypy"
     env: TOXENV=pypy-cryptographyMaster
 
@@ -77,6 +81,7 @@ matrix:
   - env: TOXENV=py27-cryptographyMaster
   - env: TOXENV=py33-cryptographyMaster
   - env: TOXENV=py34-cryptographyMaster
+  - env: TOXENV=py35-cryptographyMaster
   - env: TOXENV=pypy-cryptographyMaster
   - env: OPENSSL=0.9.8 TOXENV=py27
   - env: TOXENV=pypy
diff --git a/doc/introduction.rst b/doc/introduction.rst
index 41f8e59e8..beededfce 100644
--- a/doc/introduction.rst
+++ b/doc/introduction.rst
@@ -14,7 +14,7 @@ Other OpenSSL wrappers for Python at the time were also limited, though in diffe
 Later it was maintained by `Jean-Paul Calderone`_ who among other things managed to make pyOpenSSL a pure Python project which the current maintainers are *very* grateful for.
 
 Over the time the standard library's ``ssl`` module improved, never reaching the completeness of pyOpenSSL's API coverage.
-Despite `PEP 466`_ many useful features remain Python 3-only and pyOpenSSL remains the only alternative for full-featured TLS code across all noteworthy Python versions from 2.6 through 3.4 and PyPy_.
+Despite `PEP 466`_ many useful features remain Python 3-only and pyOpenSSL remains the only alternative for full-featured TLS code across all noteworthy Python versions from 2.6 through 3.5 and PyPy_.
 
 
 Development
diff --git a/tox.ini b/tox.ini
index fcc7259a1..7a4030966 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest,flake8,pyroma,docs
+envlist = {pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster},pypi-readme,check-manifest,flake8,pyroma,docs
 
 [testenv]
 whitelist_externals =