diff --git a/.travis.yml b/.travis.yml
index 86e7187bde..00a7ba50f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,10 @@ matrix:
        env: TOXENV=py37
      - python: 3.7
        env: TOXENV=py37-functional
+     - python: 3.8
+       env: TOXENV=py38
+     - python: 3.8
+       env: TOXENV=py38-functional
 
 install:
   - pip install tox
diff --git a/setup.py b/setup.py
index d17b573a07..9cdfcb6115 100644
--- a/setup.py
+++ b/setup.py
@@ -77,5 +77,6 @@
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
     ],
 )
diff --git a/tox.ini b/tox.ini
index deaa4daf64..0930582f4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,7 @@
 [tox]
-envlist = py27, py35, py36, py37
+envlist =
+   py27, py3{5,6,7,8}
+   py27-functional, py3{5,6,7,8}-functional
 
 [testenv]
 passenv = TOXENV CI TRAVIS TRAVIS_*
@@ -9,7 +11,8 @@ deps = -r{toxinidir}/test-requirements.txt
        -r{toxinidir}/requirements.txt
 commands =
    python -V
-   pytest -vvv -s --ignore=kubernetes/e2e_test
+   !functional: pytest -vvv -s --ignore=kubernetes/e2e_test
+   functional: {toxinidir}/scripts/kube-init.sh pytest -vvv -s []
 
 [testenv:docs]
 commands =
@@ -19,26 +22,6 @@ commands =
 commands =
    {toxinidir}/scripts/update-pycodestyle.sh
 
-[testenv:py27-functional]
-commands =
-   python -V
-   {toxinidir}/scripts/kube-init.sh pytest -vvv -s []
-
-[testenv:py35-functional]
-commands =
-   python -V
-   {toxinidir}/scripts/kube-init.sh pytest -vvv -s []
-
-[testenv:py36-functional]
-commands =
-   python -V
-   {toxinidir}/scripts/kube-init.sh pytest -vvv -s []
-
-[testenv:py37-functional]
-commands =
-   python -V
-   {toxinidir}/scripts/kube-init.sh pytest -vvv -s []
-
 [testenv:coverage]
 commands =
    python -V