diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index 1cde6a6e..9fb2a890 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -6,10 +6,11 @@
         - rally-tox-py36
         - rally-tox-py37
         - rally-tox-py38
+        - rally-tox-py39
         - rally-dsvm-tox-functional
         - rally-openstack-docker-build
         - rally-task-basic-with-existing-users
-        - rally-task-simple-job
+        #- rally-task-simple-job
         - rally-task-barbican:
             files:
               - .zuul.d/zuul.yaml
@@ -88,10 +89,11 @@
         - rally-tox-py36
         - rally-tox-py37
         - rally-tox-py38
+        - rally-tox-py39
         - rally-dsvm-tox-functional
         - rally-openstack-docker-build
         - rally-task-basic-with-existing-users
-        - rally-task-simple-job
+        #- rally-task-simple-job
         - rally-task-barbican:
             files:
               - .zuul.d/zuul.yaml
diff --git a/tests/ci/playbooks/roles/tox-install/tasks/main.yaml b/tests/ci/playbooks/roles/tox-install/tasks/main.yaml
deleted file mode 100644
index 4090346b..00000000
--- a/tests/ci/playbooks/roles/tox-install/tasks/main.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-- name: Check required version of Python
-  args:
-    chdir: "{{ zuul.project.src_dir }}"
-  shell:
-    executable: /bin/sh
-    cmd: |
-      set -e
-
-      iniget(){
-          local xtrace
-          xtrace=$(set +o | grep xtrace)
-          set +o xtrace
-          local section=$1
-          local file="tox.ini"
-          local option="basepython"
-          local line
-
-          line=$(sed -ne "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ p; }" "$file")
-          echo ${line#*= python}
-          $xtrace
-      }
-
-      tox_testenv_python=$(iniget 'testenv:{{ tox_env }}')
-      if [ "$tox_testenv_python" != "" ]; then
-          echo $tox_testenv_python
-      else
-          echo $(iniget 'testenv')
-      fi
-  register: python_version
-
-- name: Install the proper python version
-  become: True
-  become_user: root
-  shell:
-    executable: /bin/sh
-    cmd: |
-      set -e
-
-      apt-get update
-      apt-get install python{{ python_version.stdout }}-dev --yes
-
-- name: Install the proper python pip version
-  become: True
-  become_user: root
-  shell:
-    executable: /bin/bash
-    cmd: |
-      set -e
-      curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-      python{{ python_version.stdout }} get-pip.py
-
-- name: Install python tox
-  become: True
-  become_user: root
-  shell:
-    executable: /bin/bash
-    cmd: |
-      pip{{ python_version.stdout }} install tox
diff --git a/tests/ci/playbooks/tox-functional-env-run.yaml b/tests/ci/playbooks/tox-functional-env-run.yaml
index 9f3909a5..f13c2d84 100644
--- a/tests/ci/playbooks/tox-functional-env-run.yaml
+++ b/tests/ci/playbooks/tox-functional-env-run.yaml
@@ -11,6 +11,5 @@
     # pass a check at 'prepare-for-rally-task' role.
     rally_task: "rally-jobs/simple-job.yaml"
   roles:
-    - tox-install
     - prepare-for-rally-task
     - tox-run
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 48d02718..9ffbb203 100644
--- a/tox.ini
+++ b/tox.ini
@@ -41,6 +41,9 @@ basepython = python3.7
 [testenv:py38]
 basepython = python3.8
 
+[testenv:py39]
+basepython = python3.9
+
 
 [testenv:venv]
 basepython = python3