diff --git a/.travis.yml b/.travis.yml
index 17e4854..f8bf977 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,13 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
+  - "3.6"
   - "pypy"
   - "pypy3"
+matrix:
+  allow_failures:
+    - python: "pypy3"
 install:
   - pip install tox
 script:
diff --git a/CHANGES.rst b/CHANGES.rst
index c8a90f6..6d1ff6b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,7 +14,9 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- also run tests with python 3.5 and 3.6 [geier]
+
+- allow tests failing with pypy3 on travis.ci [geier]
 
 
 3.11 (2016-11-18)
diff --git a/tox.ini b/tox.ini
index f582b7b..8963bcc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 # to run for a specific environment, use ``tox -e ENVNAME``
 [tox]
-envlist = py26,py27,py33,py34
+envlist = py26,py27,py33,py34,py35,py36
 
 [testenv]
 deps =