diff --git a/.travis.yml b/.travis.yml
index 7cd6ae159d..b3a4dba400 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,10 @@ language: python
 cache: pip
 matrix:
   include:
+    - python: 3.7
+      env: TOXENV=py37
+      dist: xenial
+      sudo: true
     - python: 3.6
       env: TOXENV=py36
     - python: 3.5
diff --git a/README.md b/README.md
index 2b72e48c2f..fa2856f055 100644
--- a/README.md
+++ b/README.md
@@ -74,4 +74,4 @@ Open source licensed under the MIT license (see _LICENSE_ file for details).
 
 ## Supported Python Versions
 
-Locust supports Python 2.7, 3.4, 3.5, and 3.6.
+Locust is supported on Python 2.7, 3.4, 3.5, 3.6, 3.7.
diff --git a/docs/installation.rst b/docs/installation.rst
index 1a99a217f0..a6b53bc3fd 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -34,7 +34,7 @@ To see available options, run:
 Supported Python Versions
 -------------------------
 
-Locust supports Python 2.7, 3.4, 3.5, and 3.6.
+Locust is supported on Python 2.7, 3.4, 3.5, 3.6, 3.7.
 
 
 Installing Locust on Windows
diff --git a/setup.py b/setup.py
index 7499486bbd..e286d07563 100644
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,7 @@
 
 from setuptools import find_packages, setup
 
+
 # parse version from locust/__init__.py
 _version_re = re.compile(r'__version__\s+=\s+(.*)')
 _init_file = os.path.join(os.path.abspath(os.path.dirname(__file__)), "locust", "__init__.py")
@@ -29,6 +30,7 @@
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Intended Audience :: Developers",
         "Intended Audience :: System Administrators",
     ],
@@ -37,7 +39,7 @@
     author_email='',
     url='https://locust.io/',
     license='MIT',
-    packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+    packages=find_packages(exclude=['examples', 'tests']),
     include_package_data=True,
     zip_safe=False,
     install_requires=["gevent>=1.2.2", "flask>=0.10.1", "requests>=2.9.1", "msgpack>=0.4.2", "six>=1.10.0", "pyzmq>=16.0.2"],
diff --git a/tox.ini b/tox.ini
index dfa2693c85..9d472cabbe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36
+envlist = py27, py34, py35, py36, py37
 
 [testenv]
 deps =