diff --git a/tox.ini b/tox.ini
index b6cc30c77c..e2f81631ad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.5.0
-envlist = docs,py36,py37,functional-py36,functional-py37,pep8,specs
+envlist = docs,py3,functional-py3,pep8,specs
 skipsdist = True
 ignore_basepython_conflict = True
 
@@ -51,6 +51,10 @@ commands =
 # This will use whatever 'basepython' is set to, so the name is ambiguous.
 setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
 
+[testenv:functional-py3]
+basepython = python3
+setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
+
 [testenv:functional-py36]
 basepython = python3.6
 setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
@@ -59,6 +63,10 @@ setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
 basepython = python3.7
 setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
 
+[testenv:functional-py38]
+basepython = python3.8
+setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
+
 [testenv:debug]
 commands = oslo_debug_helper {posargs}