diff --git a/test/cases/oscap.sh b/test/cases/oscap.sh
index fa5c651f7..d4c67d404 100755
--- a/test/cases/oscap.sh
+++ b/test/cases/oscap.sh
@@ -77,12 +77,12 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
 SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.8")
+    "rhel-8"* )
         OS_VARIANT="rhel8-unknown"
         PROFILE="xccdf_org.ssgproject.content_profile_cis"
         DATASTREAM="/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml"
         ;;
-    "rhel-9.2")
+    "rhel-9"* )
         OS_VARIANT="rhel9-unknown"
         PROFILE="xccdf_org.ssgproject.content_profile_cis"
         DATASTREAM="/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml"
diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index 92629de88..f19d5af21 100755
--- a/test/cases/ostree-ng.sh
+++ b/test/cases/ostree-ng.sh
@@ -126,13 +126,13 @@ case "${ID}-${VERSION_ID}" in
         DIRS_FILES_CUSTOMIZATION="true"
         SYSROOT_RO="true"
         ;;
-    "rhel-8.8")
+    "rhel-8"* )
         OSTREE_REF="test/rhel/8/${ARCH}/edge"
         OS_VARIANT="rhel8-unknown"
         EMBEDED_CONTAINER="true"
         DIRS_FILES_CUSTOMIZATION="true"
         ;;
-    "rhel-9.2")
+    "rhel-9"* )
         OSTREE_REF="test/rhel/9/${ARCH}/edge"
         OS_VARIANT="rhel9-unknown"
         EMBEDED_CONTAINER="true"
diff --git a/test/cases/ostree-raw-image.sh b/test/cases/ostree-raw-image.sh
index 940470d99..dd28de1c0 100755
--- a/test/cases/ostree-raw-image.sh
+++ b/test/cases/ostree-raw-image.sh
@@ -98,11 +98,11 @@ SYSROOT_RO="false"
 CUSTOM_DIRS_FILES="false"
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.8")
+    "rhel-8"* )
         OSTREE_REF="rhel/8/${ARCH}/edge"
         OS_VARIANT="rhel8-unknown"
         ;;
-    "rhel-9.2")
+    "rhel-9"* )
         OSTREE_REF="rhel/9/${ARCH}/edge"
         OS_VARIANT="rhel9-unknown"
         SYSROOT_RO="true"
diff --git a/test/cases/ostree-rebase-bios.sh b/test/cases/ostree-rebase-bios.sh
index 15dfbd406..e40fbf941 100755
--- a/test/cases/ostree-rebase-bios.sh
+++ b/test/cases/ostree-rebase-bios.sh
@@ -88,21 +88,21 @@ KERNEL_RT_PKG="kernel-rt"
 SYSROOT_RO="false"
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.8")
+    "rhel-8"* )
         OSTREE_REF="rhel/8/${ARCH}/edge"
         OS_VARIANT="rhel8-unknown"
         # Use a stable installer image unless it's the nightly pipeline
-        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.7.0/BaseOS/x86_64/os/"
+        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.8.0/BaseOS/x86_64/os/"
         if [ "${NIGHTLY:=false}" == "true" ]; then
             BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
         fi
         PARENT_REF="rhel/8/${ARCH}/edge"
         ;;
-    "rhel-9.2")
+    "rhel-9"* )
         OSTREE_REF="rhel/9/${ARCH}/edge"
         OS_VARIANT="rhel9-unknown"
         # Use a stable installer image unless it's the nightly pipeline
-        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.1.0/BaseOS/x86_64/os/"
+        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.2.0/BaseOS/x86_64/os/"
         if [ "${NIGHTLY:=false}" == "true" ]; then
             BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
         fi
diff --git a/test/cases/ostree-rebase-uefi.sh b/test/cases/ostree-rebase-uefi.sh
index 35e538f51..be53276c5 100755
--- a/test/cases/ostree-rebase-uefi.sh
+++ b/test/cases/ostree-rebase-uefi.sh
@@ -93,21 +93,21 @@ KERNEL_RT_PKG="kernel-rt"
 SYSROOT_RO="false"
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.8")
+    "rhel-8"* )
         OSTREE_REF="rhel/8/${ARCH}/edge"
         OS_VARIANT="rhel8-unknown"
         # Use a stable installer image unless it's the nightly pipeline
-        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.7.0/BaseOS/x86_64/os/"
+        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.8.0/BaseOS/x86_64/os/"
         if [ "${NIGHTLY:=false}" == "true" ]; then
             BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
         fi
         PARENT_REF="rhel/8/${ARCH}/edge"
         ;;
-    "rhel-9.2")
+    "rhel-9"* )
         OSTREE_REF="rhel/9/${ARCH}/edge"
         OS_VARIANT="rhel9-unknown"
         # Use a stable installer image unless it's the nightly pipeline
-        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.1.0/BaseOS/x86_64/os/"
+        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.2.0/BaseOS/x86_64/os/"
         if [ "${NIGHTLY:=false}" == "true" ]; then
             BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
         fi
diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh
index a01ca0bc8..efebc6e54 100755
--- a/test/cases/ostree-simplified-installer.sh
+++ b/test/cases/ostree-simplified-installer.sh
@@ -117,11 +117,11 @@ ANSIBLE_USER="admin"
 FDO_USER_ONBOARDING="false"
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.8")
+    "rhel-8"* )
         OSTREE_REF="rhel/8/${ARCH}/edge"
         OS_VARIANT="rhel8-unknown"
         ;;
-    "rhel-9.2")
+    "rhel-9"* )
         OSTREE_REF="rhel/9/${ARCH}/edge"
         OS_VARIANT="rhel9-unknown"
         SYSROOT_RO="true"
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
index f553ff718..b7efa600a 100755
--- a/test/cases/ostree.sh
+++ b/test/cases/ostree.sh
@@ -71,6 +71,22 @@ case "${ID}-${VERSION_ID}" in
         DIRS_FILES_CUSTOMIZATION="true"
 
 
+        # Use a stable installer image unless it's the nightly pipeline
+        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.8.0/BaseOS/x86_64/os/"
+        if [ "${NIGHTLY:=false}" == "true" ]; then
+            BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
+        fi
+        ;;
+    "rhel-8.9")
+        IMAGE_TYPE=edge-commit
+        OSTREE_REF="rhel/8/${ARCH}/edge"
+        OS_VARIANT="rhel8-unknown"
+        USER_IN_COMMIT="true"
+        EMBEDED_CONTAINER="true"
+        FIREWALL_FEATURE="true"
+        DIRS_FILES_CUSTOMIZATION="true"
+
+
         # Use a stable installer image unless it's the nightly pipeline
         BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.8.0/BaseOS/x86_64/os/"
         if [ "${NIGHTLY:=false}" == "true" ]; then
@@ -97,6 +113,22 @@ case "${ID}-${VERSION_ID}" in
         DIRS_FILES_CUSTOMIZATION="true"
         SYSROOT_RO="true"
 
+        # Use a stable installer image unless it's the nightly pipeline
+        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.2.0/BaseOS/x86_64/os/"
+        if [ "${NIGHTLY:=false}" == "true" ]; then
+            BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
+        fi
+        ;;
+    "rhel-9.3")
+        IMAGE_TYPE=edge-commit
+        OSTREE_REF="rhel/9/${ARCH}/edge"
+        OS_VARIANT="rhel9-unknown"
+        USER_IN_COMMIT="true"
+        EMBEDED_CONTAINER="true"
+        FIREWALL_FEATURE="true"
+        DIRS_FILES_CUSTOMIZATION="true"
+        SYSROOT_RO="true"
+
         # Use a stable installer image unless it's the nightly pipeline
         BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.2.0/BaseOS/x86_64/os/"
         if [ "${NIGHTLY:=false}" == "true" ]; then
diff --git a/test/cases/vmware.sh b/test/cases/vmware.sh
index a7e7b7b79..921f11c7e 100755
--- a/test/cases/vmware.sh
+++ b/test/cases/vmware.sh
@@ -15,6 +15,11 @@ source /usr/libexec/tests/osbuild-composer/shared_lib.sh
 
 IMAGE_TYPE="$1"
 
+if ! nvrGreaterOrEqual "osbuild" "85" && [ "$IMAGE_TYPE" == "ova" ]; then
+    greenprint "Skipping ova test on older osbuild-composer"
+    exit 0
+fi
+
 # Provision the software under test.
 /usr/libexec/osbuild-composer-test/provision.sh none
 
diff --git a/tools/libvirt_test.sh b/tools/libvirt_test.sh
index 22cbc83c3..68b624700 100755
--- a/tools/libvirt_test.sh
+++ b/tools/libvirt_test.sh
@@ -272,7 +272,8 @@ elif [[ $ARCH == 's390x' ]]; then
 else
     case "${ID}-${VERSION_ID}" in
         "rhel-8"* | "centos-8")
-             MIN_RAM="1024"
+             # was 1024 before 8.9
+             MIN_RAM="1536"
              ;;
         "rhel-9"* | "centos-9")
              MIN_RAM="1536"