diff --git a/setup.cfg b/setup.cfg
index fabf62af2..ca52986e9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,17 +5,18 @@ description-file =
     README.rst
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
+home-page = https://tobiko.readthedocs.io/en/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-    Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
 
 keywords =
     setup
diff --git a/tox.ini b/tox.ini
index f427f3c18..75aa2eef2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -179,7 +179,7 @@ commands = {posargs:bash}
 
 # basepython = {[testenv:venv]basepython}
 # Package libselinux-python3 still not available on centos-7
-basepython = python
+basepython = python3
 deps = {[testenv:venv]deps}
 passenv =
     {[testenv:venv]passenv}
diff --git a/zuul.d/infrared.yaml b/zuul.d/infrared.yaml
index 954b729fc..f913af36e 100644
--- a/zuul.d/infrared.yaml
+++ b/zuul.d/infrared.yaml
@@ -1,17 +1,41 @@
 ---
 
 - job:
-    name: tobiko-tox-infrared-centos-7
+    name: tobiko-tox-infrared-py36
     parent: openstack-tox
-    voting: false
-    nodeset: centos-7
-    timeout: 2400
+    abstract: true
+    timeout: 1800
     description: |
-      Run tobiko infrared plugin
+      Run test cases using tobiko infrared plugin
     vars:
       tox_envlist: infrared
-      # tox_extra_args: -- --tox_envlist functional
       bindep_profile: test
       python_version: 3.6
-    # compile and install python3.8 from source code
     pre-run: playbooks/infrared/pre.yaml
+
+
+- job:
+    name: tobiko-tox-infrared-py36-centos-7
+    parent: tobiko-tox-infrared-py36
+    nodeset: centos-7
+    voting: false
+    description: |
+      Run py36 test cases using tobiko infrared plugin on CentOS 7
+
+
+- job:
+    name: tobiko-tox-infrared-py36-centos-8
+    parent: tobiko-tox-infrared-py36
+    nodeset: centos-8
+    voting: false
+    description: |
+      Run py36 test cases using tobiko infrared plugin on CentOS 8
+
+
+- job:
+    name: tobiko-tox-infrared-py36-ubuntu-bionic
+    parent: tobiko-tox-infrared-py36
+    nodeset: ubuntu-bionic
+    voting: false
+    description: |
+      Run py36 test cases using tobiko infrared plugin on Ubuntu Bionic
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index cae7e1abc..25a57c055 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -20,7 +20,9 @@
         - tobiko-devstack-functional
         - tobiko-devstack-faults-centos-7
         - tobiko-devstack-faults-ubuntu-bionic
-        - tobiko-tox-infrared-centos-7
+        - tobiko-tox-infrared-py36-centos-7
+        - tobiko-tox-infrared-py36-centos-8
+        - tobiko-tox-infrared-py36-ubuntu-bionic
         - tobiko-tripleo-functional
         - tobiko-tripleo-faults