diff --git a/.travis.yml b/.travis.yml
index b2d356e19..f701302d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,8 @@ matrix:
   include:
     - env: TESTENV=py36
       python: '3.6-dev'
+    - env: TESTENV=py37
+      python: 'nightly'
 
 script: tox --recreate -e $TESTENV
 
diff --git a/AUTHORS b/AUTHORS
index acf715cde..c2400f508 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,6 +48,7 @@ Duncan Betts
 Edison Gustavo Muenz
 Edoardo Batini
 Eduardo Schettino
+Eli Boyarski
 Elizaveta Shashkova
 Endre Galaczi
 Eric Hunsberger
@@ -139,6 +140,6 @@ Tom Viner
 Trevor Bekolay
 Tyler Goodlet
 Vasily Kuznetsov
+Victor Uriarte
 Wouter van Ackooy
 Xuecong Liao
-Eli Boyarski
diff --git a/setup.py b/setup.py
index d602b7979..1d0630cd2 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ classifiers = ['Development Status :: 6 - Mature',
                'Topic :: Software Development :: Libraries',
                'Topic :: Utilities'] + [
               ('Programming Language :: Python :: %s' % x) for x in
-                  '2 2.6 2.7 3 3.3 3.4 3.5'.split()]
+                  '2 2.6 2.7 3 3.3 3.4 3.5 3.6'.split()]
 
 with open('README.rst') as fd:
     long_description = fd.read()
diff --git a/tox.ini b/tox.ini
index 4be692fc7..e57fabd4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,7 @@ envlist=
      py34
      py35
      py36
+     py37
      pypy
      {py27,py35}-{pexpect,xdist,trial}
      py27-nobyte