diff --git a/io/net/infiniband/mofed_install_test.py b/io/net/infiniband/mofed_install_test.py
index 3169474e4..f15b4cdae 100755
--- a/io/net/infiniband/mofed_install_test.py
+++ b/io/net/infiniband/mofed_install_test.py
@@ -99,9 +99,14 @@ def setUp(self):
         # on Avocado versions >= 50.0.  This is a temporary compatibility
         # enabler for older runners, but should be removed soon
         elif detected_distro.name in ['rhel', 'fedora', 'redhat']:
-            pkgs.extend(["make", "gcc", "python36-devel", "tcsh",
-                         "kernel-rpm-macros", "gdb-headless", "rpm-build",
-                         "gcc-gfortran", kernel_ver])
+            if detected_distro.version == "9":
+                pkgs.extend(["make", "gcc", "python3-devel", "tcsh",
+                             "kernel-rpm-macros", "gdb-headless", "rpm-build",
+                             "gcc-gfortran", kernel_ver])
+            elif detected_distro.version == "8":
+                pkgs.extend(["make", "gcc", "python36-devel", "tcsh",
+                             "kernel-rpm-macros", "gdb-headless", "rpm-build",
+                             "gcc-gfortran", kernel_ver])
         for pkg in pkgs:
             if not smm.check_installed(pkg) and not smm.install(pkg):
                 self.cancel("Not able to install %s" % pkg)