diff --git a/.travis.yml b/.travis.yml
index d842a129..57a12dca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,36 @@
 language: python
 sudo: false
 env:
   global: TEST_RUNNER=unittest PYTHONHASHSEED=random
 matrix:
   include:
     - python: "2.7"
       env: TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
     - python: "pypy"
       env: TEST_REQUIRE="fastimport"
     - python: "3.4"
       env: TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
     - python: "3.5"
       env: TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
+    - python: "3.5-dev"
+      env: TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
+    - python: "3.6"
+      env: TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
+    - python: "3.6-dev"
+      env: TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
+    - python: "3.7-dev"
+      env: TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
 cache:
   directories:
     - $HOME/.cache/pip
 script:
   - pip install pip --upgrade
   - pip install $TEST_REQUIRE
 
   # Test without c extensions
   - python -m $TEST_RUNNER dulwich.tests.test_suite
 
   # Test with c extensions
   - python setup.py build_ext -i
   - python -m $TEST_RUNNER dulwich.tests.test_suite
 
diff --git a/tox.ini b/tox.ini
index 5247bc7e..46888a20 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,21 +1,24 @@
 [tox]
 downloadcache = {toxworkdir}/cache/
-envlist = py27, pypy, py27-noext, pypy-noext, py34, py34-noext, py35, py35-noext
+envlist = py27, pypy, py27-noext, pypy-noext, py34, py34-noext, py35, py35-noext, py36, py36-noext
 
 [testenv]
 
 commands = make check
 recreate = True
 whitelist_externals = make
 
 [testenv:py27-noext]
 commands = make check-noextensions
 
 [testenv:pypy-noext]
 commands = make check-noextensions
 
 [testenv:py34-noext]
 commands = make check-noextensions
 
 [testenv:py35-noext]
 commands = make check-noextensions
+
+[testenv:py36-noext]
+commands = make check-noextensions