diff --git a/test/cases/cross-distro.sh b/test/cases/cross-distro.sh
index 2229ed9ca..918177476 100755
--- a/test/cases/cross-distro.sh
+++ b/test/cases/cross-distro.sh
@@ -109,9 +109,9 @@ fi
 ALL_DISTROS=$(find "$REPO_PATH" -name '*.json' -printf '%P\n' | awk -F "." '{ print $1 }')
 ALL_EXPECTED_DISTROS=$(echo "$ALL_DISTROS" | grep -E "$PATTERN" | grep -Ev 'beta|stream' | sort)
 # Warning: filter out the remaining distros by matching whole words to avoid matching
-# the value rhel-93 by the pattern rhel-9!
-# If we're running on a RHEL 9.3 osbuild-composer doesn't know anything about 9.4
-# images so the value rhel-9.4 should be treated as unrecognized and error out as
+# the value rhel-9X by the pattern rhel-9!
+# If we're running on a RHEL 9.X osbuild-composer doesn't know anything about 9.X+1
+# images so the value rhel-9.X+1 should be treated as unrecognized and error out as
 # expected in the test snippet further below
 ALL_REMAINDERS=$(echo "$ALL_DISTROS" | grep -vw "$RECOGNIZED_DISTROS")
 
diff --git a/test/cases/koji.sh b/test/cases/koji.sh
index 7cb04d209..9237c64e4 100755
--- a/test/cases/koji.sh
+++ b/test/cases/koji.sh
@@ -352,9 +352,9 @@ koji --server="${KOJI_HUB_URL}" --user kojiadmin --password kojipass --authtype=
 
 # Always build the latest RHEL - that suits the koji API usecase the most.
 if [[ "$DISTRO_CODE" == rhel-8* ]]; then
-    DISTRO_CODE=rhel-89
+    DISTRO_CODE=rhel-810
 elif [[ "$DISTRO_CODE" == rhel-9* ]]; then
-    DISTRO_CODE=rhel-93
+    DISTRO_CODE=rhel-94
 fi
 
 case ${TEST_TYPE} in
diff --git a/test/cases/minimal-raw.sh b/test/cases/minimal-raw.sh
index 9026480b4..999934a50 100755
--- a/test/cases/minimal-raw.sh
+++ b/test/cases/minimal-raw.sh
@@ -86,10 +86,10 @@ SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 EDGE_USER_PASSWORD=foobar
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.10")
+    "rhel-8."*)
         OS_VARIANT="rhel8-unknown"
         ;;
-    "rhel-9.4")
+    "rhel-9."*)
         OS_VARIANT="rhel9-unknown"
         ;;
     "centos-8")
diff --git a/test/cases/oscap.sh b/test/cases/oscap.sh
index 96d0e9e28..823be11b0 100755
--- a/test/cases/oscap.sh
+++ b/test/cases/oscap.sh
@@ -12,7 +12,7 @@ source /etc/os-release
 source /usr/libexec/tests/osbuild-composer/shared_lib.sh
 
 # workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
-if [[ "$VERSION_ID" == "9.4"  || "$VERSION_ID" == "9" ]]; then
+if [[ "$VERSION_ID" == "9.3"  || "$VERSION_ID" == "9" ]]; then
     sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
 LIBVIRTD_ARGS=
 EOF
diff --git a/test/cases/ostree-ami-image.sh b/test/cases/ostree-ami-image.sh
index e003bd848..057d19684 100755
--- a/test/cases/ostree-ami-image.sh
+++ b/test/cases/ostree-ami-image.sh
@@ -80,7 +80,7 @@ SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 IGNITION_USER=core
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-9.4")
+    "rhel-9."*)
         OSTREE_REF="rhel/9/${ARCH}/edge"
         SYSROOT_RO="true"
         ;;
diff --git a/test/cases/ostree-ignition.sh b/test/cases/ostree-ignition.sh
index 1d9b4238e..2fdc127a1 100755
--- a/test/cases/ostree-ignition.sh
+++ b/test/cases/ostree-ignition.sh
@@ -116,7 +116,7 @@ IGNITION_USER_PASSWORD=foobar
 SYSROOT_RO="true"
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-9.4")
+    "rhel-9."*)
         OSTREE_REF="rhel/9/${ARCH}/edge"
         OS_VARIANT="rhel9-unknown"
         ;;
diff --git a/test/cases/ostree-pulp.sh b/test/cases/ostree-pulp.sh
index bd57ce629..b3e11ace1 100644
--- a/test/cases/ostree-pulp.sh
+++ b/test/cases/ostree-pulp.sh
@@ -15,7 +15,7 @@ fi
 
 # Set os-variant and boot location used by virt-install.
 case "${ID}-${VERSION_ID}" in
-    "rhel-9.4")
+    "rhel-9."*)
         IMAGE_TYPE=edge-commit
         OSTREE_REF="rhel/9/${ARCH}/edge"
         OS_VARIANT="rhel9-unknown"