diff --git a/infrared_plugin/requirements.txt b/infrared_plugin/requirements.txt
index 08e70da83..ece74d658 100644
--- a/infrared_plugin/requirements.txt
+++ b/infrared_plugin/requirements.txt
@@ -1 +1,2 @@
-git+https://github.com/redhat-openstack/infrared.git  # Apache-2.0
+git+https://github.com/redhat-openstack/infrared.git ; python_version < '3.8'
+git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/9 ; python_version >= '3.8'
diff --git a/roles/tests/vars/test-Fedora-32.yaml b/roles/tests/vars/test-Fedora-32.yaml
deleted file mode 100644
index a5ec4c973..000000000
--- a/roles/tests/vars/test-Fedora-32.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-ir_deps: "git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/3"
diff --git a/roles/tests/vars/test-Ubuntu-20.04.yaml b/roles/tests/vars/test-Ubuntu-20.04.yaml
deleted file mode 100644
index a5ec4c973..000000000
--- a/roles/tests/vars/test-Ubuntu-20.04.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-ir_deps: "git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/3"
diff --git a/zuul.d/infrared.yaml b/zuul.d/infrared.yaml
index 2a06d66a3..68bec0228 100644
--- a/zuul.d/infrared.yaml
+++ b/zuul.d/infrared.yaml
@@ -64,10 +64,6 @@
     voting: false
     description: |
       Run test cases using tobiko infrared plugin on Fedora 32
-    vars:
-      tox_environment:
-        # This patchset fixes to use IR with Python 3.8
-        IR_DEPS: "git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/5"
 
 
 - job:
@@ -86,7 +82,3 @@
     voting: false
     description: |
       Run test cases using tobiko infrared plugin on Ubuntu Focal
-    vars:
-      tox_environment:
-        # This patchset fixes to use IR with Python 3.8
-        IR_DEPS: "git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/5"