diff --git a/.travis.yml b/.travis.yml
index c1209a1b..465c6505 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,14 @@ python:
   - 3.4
   - 3.5
   - 3.6
+  - 3.7
 
 env:
   - JEDI_TEST_ENVIRONMENT=27
   - JEDI_TEST_ENVIRONMENT=34
   - JEDI_TEST_ENVIRONMENT=35
   - JEDI_TEST_ENVIRONMENT=36
+  - JEDI_TEST_ENVIRONMENT=37
 
 addons:
   apt:
@@ -22,7 +24,6 @@ matrix:
   allow_failures:
     - python: pypy
     - env: TOXENV=sith
-    - python: 3.7-dev
   include:
     - python: 3.6
       env:
@@ -33,7 +34,7 @@ matrix:
     # For now ignore pypy, there are so many issues that we don't really need
     # to run it.
     #- python: pypy
-    - python: "3.7-dev"
+    - python: "nightly"
 before_install:
     - ./travis_install.sh
     # Need to add the path to the Python versions in the end. This might add
diff --git a/tox.ini b/tox.ini
index 6ce07f42..a8d52fa1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36
+envlist = py27, py34, py35, py36, py37
 [testenv]
 extras = testing
 deps =