diff --git a/qemu/tests/cfg/rng_bat.cfg b/qemu/tests/cfg/rng_bat.cfg
index 5ee849a2bf..81aa4a9008 100644
--- a/qemu/tests/cfg/rng_bat.cfg
+++ b/qemu/tests/cfg/rng_bat.cfg
@@ -33,7 +33,7 @@
             check_rngd_service = "service rngd status"
             start_rngd_service = "service rngd start"
         s390x:
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
     variants:
         - @default:
diff --git a/qemu/tests/cfg/rng_host_guest_read.cfg b/qemu/tests/cfg/rng_host_guest_read.cfg
index affd555481..c63b6b5ff7 100644
--- a/qemu/tests/cfg/rng_host_guest_read.cfg
+++ b/qemu/tests/cfg/rng_host_guest_read.cfg
@@ -34,5 +34,5 @@
             check_rngd_service = "service rngd status"
             start_rngd_service = "service rngd start"
         s390x:
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
diff --git a/qemu/tests/cfg/rng_hotplug.cfg b/qemu/tests/cfg/rng_hotplug.cfg
index 70fab14227..37416134da 100644
--- a/qemu/tests/cfg/rng_hotplug.cfg
+++ b/qemu/tests/cfg/rng_hotplug.cfg
@@ -47,7 +47,7 @@
             start_rngd_service = "service rngd start"
         s390x:
             rng_driver = "virtio-rng-ccw"
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
     variants:
         - multi_rngs:
diff --git a/qemu/tests/cfg/rng_maxbytes_period.cfg b/qemu/tests/cfg/rng_maxbytes_period.cfg
index e6f104fe0e..2eff64bb7d 100644
--- a/qemu/tests/cfg/rng_maxbytes_period.cfg
+++ b/qemu/tests/cfg/rng_maxbytes_period.cfg
@@ -12,7 +12,7 @@
         check_rngd_service = "service rngd status"
         start_rngd_service = "service rngd start"
     s390x:
-        RHEL.9:
+        !RHEL.7,RHEL.8:
             update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
     variants:
         - positive_test:
diff --git a/qemu/tests/cfg/rng_read_longtime.cfg b/qemu/tests/cfg/rng_read_longtime.cfg
index c3cfd25f2d..8128b2172c 100644
--- a/qemu/tests/cfg/rng_read_longtime.cfg
+++ b/qemu/tests/cfg/rng_read_longtime.cfg
@@ -39,5 +39,5 @@
             check_rngd_service = "service rngd status"
             start_rngd_service = "service rngd start"
         s390x:
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
diff --git a/qemu/tests/cfg/rng_stress.cfg b/qemu/tests/cfg/rng_stress.cfg
index 584ce7cec3..c7173a43da 100644
--- a/qemu/tests/cfg/rng_stress.cfg
+++ b/qemu/tests/cfg/rng_stress.cfg
@@ -35,7 +35,7 @@
             start_rngd_service = "service rngd start"
         s390x:
             rng_driver = "virtio-rng-ccw"
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
     variants:
         - two_device:
diff --git a/qemu/tests/cfg/viorng_in_use.cfg b/qemu/tests/cfg/viorng_in_use.cfg
index dae6cb8aa7..bc080c1f05 100644
--- a/qemu/tests/cfg/viorng_in_use.cfg
+++ b/qemu/tests/cfg/viorng_in_use.cfg
@@ -43,7 +43,7 @@
             check_rngd_service = "service rngd status"
             start_rngd_service = "service rngd start"
         s390x:
-            RHEL.9:
+            !RHEL.7,RHEL.8:
                 update_driver = "echo 'virtio_rng.0' > /sys/devices/virtual/misc/hw_random/rng_current"
     variants:
         - before_bg_test: