diff --git a/.travis.yml b/.travis.yml
index 901b639..32d42b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -146,6 +146,42 @@ matrix:
           os: linux
           dist: xenial
           env: TOXENV=py36 RUN_INTEGRATION_TESTS=2
+#        - python: 3.7
+#          os: linux
+#          dist: precise
+#          env: TOXENV=py37 RUN_INTEGRATION_TESTS=0
+#        - python: 3.7
+#          os: linux
+#          dist: trusty
+#          env: TOXENV=py37 RUN_INTEGRATION_TESTS=0
+        - python: 3.7
+          os: linux
+          dist: xenial
+          env: TOXENV=py37 RUN_INTEGRATION_TESTS=0
+#        - python: 3.7
+#          os: linux
+#          dist: precise
+#          env: TOXENV=py37 RUN_INTEGRATION_TESTS=1
+#        - python: 3.7
+#          os: linux
+#          dist: trusty
+#          env: TOXENV=py37 RUN_INTEGRATION_TESTS=1
+        - python: 3.7
+          os: linux
+          dist: xenial
+          env: TOXENV=py36 RUN_INTEGRATION_TESTS=1
+#        - python: 3.7
+#          os: linux
+#          dist: precise
+#          env: TOXENV=py37 RUN_INTEGRATION_TESTS=2
+#        - python: 3.7
+#          os: linux
+#          dist: trusty
+#          env: TOXENV=py37 RUN_INTEGRATION_TESTS=2
+        - python: 3.7
+          os: linux
+          dist: xenial
+          env: TOXENV=py37 RUN_INTEGRATION_TESTS=2
         - python: 2.7
           os: linux
           dist: precise
diff --git a/setup.py b/setup.py
index 09edbd9..ee9eb65 100644
--- a/setup.py
+++ b/setup.py
@@ -60,5 +60,6 @@ setuptools.setup(
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
     ],
 )
diff --git a/tox.ini b/tox.ini
index cdbb082..5b1e21f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,py27,py34,py35,py36,bandit,docs
+envlist = pep8,py27,py34,py35,py36,py37,bandit,docs
 
 [testenv]
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH