diff --git a/.travis.yml b/.travis.yml
index f82ff5eacd..fce474b421 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,10 @@ matrix:
        env: TOXENV=py36
      - python: 3.6
        env: TOXENV=py36-functional
+     - python: 3.7
+       env: TOXENV=py37
+     - python: 3.7
+       env: TOXENV=py37-functional
 
 install:
   - pip install tox
diff --git a/setup.py b/setup.py
index 85ad8d17a9..06e17c6683 100644
--- a/setup.py
+++ b/setup.py
@@ -77,5 +77,6 @@
         "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 44aec7172f..a271d7854c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36
+envlist = py27, py34, py35, py36, py37
 
 [testenv]
 passenv = TOXENV CI TRAVIS TRAVIS_*
@@ -34,6 +34,11 @@ commands =
    python -V
    {toxinidir}/scripts/kube-init.sh py.test -vvv -s []
 
+[testenv:py37-functional]
+commands =
+   python -V
+   {toxinidir}/scripts/kube-init.sh py.test -vvv -s []
+
 [testenv:coverage]
 commands =
    python -V