diff --git a/.travis.yml b/.travis.yml
index d5b5e50..968fa8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,14 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  - 3.7-dev
   - pypy
 matrix:
-  allow_failures:
-    - env: TOXENV=cov
   include:
+    - { python: "3.7", dist: xenial, sudo: true }
     - python: 3.5
       env: TOXENV=cov
+  allow_failures:
+    - env: TOXENV=cov
 install:
     - pip install --quiet tox-travis
 script:
diff --git a/setup.py b/setup.py
index 3eef0e4..29a0ddf 100755
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,8 @@ setup(name='parso',
           'Programming Language :: Python :: 3.3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
           'Topic :: Software Development :: Libraries :: Python Modules',
           'Topic :: Text Editors :: Integrated Development Environments (IDE)',
           'Topic :: Utilities',