diff --git a/.zuul.yaml b/.zuul.yaml
index b2d364a..c33349c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -7,10 +7,12 @@
         - openstack-tox-linters
         - kube-cpusets-tox-py27
         - kube-cpusets-tox-py36
+        - kube-cpusets-tox-py39
         - kube-cpusets-tox-flake8
         - kube-cpusets-tox-pylint
         - kube-memory-tox-py27
         - kube-memory-tox-py36
+        - kube-memory-tox-py39
         - kube-memory-tox-flake8
         - kube-memory-tox-pylint
     gate:
@@ -18,10 +20,12 @@
         - openstack-tox-linters
         - kube-cpusets-tox-py27
         - kube-cpusets-tox-py36
+        - kube-cpusets-tox-py39
         - kube-cpusets-tox-flake8
         - kube-cpusets-tox-pylint
         - kube-memory-tox-py27
         - kube-memory-tox-py36
+        - kube-memory-tox-py39
         - kube-memory-tox-flake8
         - kube-memory-tox-pylint
     post:
@@ -29,10 +33,12 @@
         - stx-monitoring-upload-git-mirror
         - kube-cpusets-tox-py27
         - kube-cpusets-tox-py36
+        - kube-cpusets-tox-py39
         - kube-cpusets-tox-flake8
         - kube-cpusets-tox-pylint
         - kube-memory-tox-py27
         - kube-memory-tox-py36
+        - kube-memory-tox-py39
         - kube-memory-tox-flake8
         - kube-memory-tox-pylint
 
@@ -91,6 +97,22 @@
       tox_envlist: py36
       tox_extra_args: -c kube-cpusets/kube-cpusets/tox.ini
 
+- job:
+    name: kube-cpusets-tox-py39
+    parent: tox-py39
+    description: |
+      Run py39 for kube-cpusets
+    required-projects:
+      - starlingx/config
+    nodeset: debian-bullseye
+    files:
+      - kube-cpusets/kube-cpusets/*
+    vars:
+      python_version: 3.9
+      tox_envlist: py39
+      tox_extra_args: -c kube-cpusets/kube-cpusets/tox.ini
+
+
 - job:
     name: kube-cpusets-tox-py27
     parent: tox
@@ -147,6 +169,22 @@
       tox_envlist: py36
       tox_extra_args: -c kube-memory/kube-memory/tox.ini
 
+- job:
+    name: kube-memory-tox-py39
+    parent: tox-py39
+    description: |
+      Run py39 test for kube-memory
+    nodeset: debian-bullseye
+    required-projects:
+      - starlingx/config
+    files:
+      - kube-memory/kube-memory/*
+    vars:
+      python_version: 3.9
+      tox_envlist: py39
+      tox_extra_args: -c kube-memory/kube-memory/tox.ini
+
+
 - job:
     name: kube-memory-tox-py27
     parent: tox
diff --git a/kube-cpusets/kube-cpusets/tox.ini b/kube-cpusets/kube-cpusets/tox.ini
index 32bbe27..878f38c 100644
--- a/kube-cpusets/kube-cpusets/tox.ini
+++ b/kube-cpusets/kube-cpusets/tox.ini
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 [tox]
-envlist = flake8,py27,py36,pylint,cover
+envlist = flake8,py27,py36,py39,pylint,cover
 minversion = 2.3.2
 skipsdist = True
 stxdir = {toxinidir}/../../..
@@ -37,19 +37,33 @@ commands =
   find . -name "*.pyc" -delete
   stestr run {posargs}
   stestr slowest
+
 [testenv:py27]
 basepython = python2.7
 commands = {[testenv:stestr]commands}
+
 [testenv:py36]
 basepython = python3.6
 commands = {[testenv:stestr]commands}
+
+[testenv:py39]
+basepython = python3.9
+install_command = pip install \
+    -v -v -v \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
+    {opts} {packages}
+commands = {[testenv:stestr]commands}
+
+
 [bandit]
 exclude = tests
+
 [testenv:bandit]
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
         bandit
 commands = bandit --ini tox.ini -n 5 -r kube_cpusets
+
 [flake8]
 show-source = True
 ignore =
diff --git a/kube-memory/kube-memory/tox.ini b/kube-memory/kube-memory/tox.ini
index 1acfdf3..5625a27 100644
--- a/kube-memory/kube-memory/tox.ini
+++ b/kube-memory/kube-memory/tox.ini
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 [tox]
-envlist = flake8,py27,py36,pylint,cover
+envlist = flake8,py27,py36,py39,pylint,cover
 minversion = 2.3.2
 skipsdist = True
 stxdir = {toxinidir}/../../..
@@ -38,12 +38,23 @@ commands =
   find . -name "*.pyc" -delete
   stestr run {posargs}
   stestr slowest
+
 [testenv:py27]
 basepython = python2.7
 commands = {[testenv:stestr]commands}
+
 [testenv:py36]
 basepython = python3.6
 commands = {[testenv:stestr]commands}
+
+[testenv:py39]
+basepython = python3.9
+install_command = pip install \
+    -v -v -v \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
+    {opts} {packages}
+commands = {[testenv:stestr]commands}
+
 [bandit]
 exclude = tests
 [testenv:bandit]
@@ -51,6 +62,7 @@ basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
         bandit
 commands = bandit --ini tox.ini -n 5 -r kube_memory
+
 [flake8]
 show-source = True
 ignore =
@@ -68,12 +80,14 @@ usedevelop = False
 #skip_install = True
 commands =
     flake8 {posargs} .
+
 [testenv:pylint]
 deps = {[testenv]deps}
        pylint
 basepython = python3.6
 sitepackages = False
 commands = pylint kube_memory --rcfile=./pylint.rc
+
 [testenv:cover]
 setenv =
     PYTHON=coverage run --parallel-mode