diff --git a/.zuul.yaml b/.zuul.yaml
index 5f3ab5a68..03d809667 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -332,7 +332,7 @@
         - tox-pep8
         - tox-py35:
             nodeset: ubuntu-xenial
-        - tox-py36
+        - tox-py38
         - nodepool-zuul-functional:
             voting: false
         - nodepool-functional-openstack:
@@ -355,7 +355,7 @@
         - tox-pep8
         - tox-py35:
             nodeset: ubuntu-xenial
-        - tox-py36
+        - tox-py38
         - nodepool-functional-openstack
         - nodepool-functional-openstack-src
         - nodepool-functional-k8s
diff --git a/requirements.txt b/requirements.txt
index 2b079fc9c..320e2aa9b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ pbr>=1.3
 
 PyYAML
 paramiko>=2.0.1
-python-daemon>=2.0.4,<2.1.0
+python-daemon>=2.0.4
 extras
 statsd>=3.0
 PrettyTable>=0.6,<0.8
diff --git a/setup.cfg b/setup.cfg
index 1aa53621b..81a4ef7cc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,9 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
 
 [pbr]
 warnerrors = True
diff --git a/tox.ini b/tox.ini
index 5a665b4c3..7769dfb5d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.1
 skipsdist = True
-envlist = pep8,py35
+envlist = pep8,py3
 ignore_basepython_conflict = True
 
 [testenv]