diff --git a/test/cases/api.sh b/test/cases/api.sh
index 0942043be..888bdf984 100755
--- a/test/cases/api.sh
+++ b/test/cases/api.sh
@@ -401,6 +401,14 @@ case "$ID-$VERSION_ID" in
       SSH_USER="cloud-user"
     fi
     ;;
+  "rhel-8.6")
+    DISTRO="rhel-86"
+    if [[ "$CLOUD_PROVIDER" == "$CLOUD_PROVIDER_AWS" ]]; then
+      SSH_USER="ec2-user"
+    else
+      SSH_USER="cloud-user"
+    fi
+    ;;
   "rhel-8.5")
     DISTRO="rhel-85"
     if [[ "$CLOUD_PROVIDER" == "$CLOUD_PROVIDER_AWS" ]]; then
diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index c10940cee..5fb170f99 100755
--- a/test/cases/ostree-ng.sh
+++ b/test/cases/ostree-ng.sh
@@ -101,7 +101,7 @@ case "${ID}-${VERSION_ID}" in
         USER_IN_UPGRADE_BP="true"
         INSTALLER_PATH="/ostree/repo"
         ;;
-    "rhel-8.5")
+    "rhel-8.5" | "rhel-8.6")
         CONTAINER_TYPE=edge-container
         CONTAINER_FILENAME=container.tar
         INSTALLER_TYPE=edge-installer
diff --git a/test/cases/ostree-raw-image.sh b/test/cases/ostree-raw-image.sh
index e5863cdc9..dc66ab15b 100755
--- a/test/cases/ostree-raw-image.sh
+++ b/test/cases/ostree-raw-image.sh
@@ -85,13 +85,7 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
 SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.5")
-        CONTAINER_TYPE=edge-container
-        CONTAINER_FILENAME=container.tar
-        INSTALLER_TYPE=edge-raw-image
-        INSTALLER_FILENAME=image.raw.xz
-        ;;
-    "rhel-9.0")
+    "rhel-8.5" | "rhel-8.6" | "rhel-9.0")
         CONTAINER_TYPE=edge-container
         CONTAINER_FILENAME=container.tar
         INSTALLER_TYPE=edge-raw-image
diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh
index 9b42f89ad..a185adb0e 100755
--- a/test/cases/ostree-simplified-installer.sh
+++ b/test/cases/ostree-simplified-installer.sh
@@ -94,13 +94,7 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
 SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.5")
-        CONTAINER_TYPE=edge-container
-        CONTAINER_FILENAME=container.tar
-        INSTALLER_TYPE=edge-simplified-installer
-        INSTALLER_FILENAME=simplified-installer.iso
-        ;;
-    "rhel-9.0")
+    "rhel-8.5" | "rhel-8.6" | "rhel-9.0")
         CONTAINER_TYPE=edge-container
         CONTAINER_FILENAME=container.tar
         INSTALLER_TYPE=edge-simplified-installer
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
index ae7dc5179..f81878a04 100755
--- a/test/cases/ostree.sh
+++ b/test/cases/ostree.sh
@@ -29,7 +29,7 @@ case "${ID}-${VERSION_ID}" in
         OS_VARIANT="rhel8.4"
         USER_IN_COMMIT="false"
         BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.4.0/BaseOS/x86_64/os/";;
-    "rhel-8.5")
+    "rhel-8.5" | "rhel-8.6")
         IMAGE_TYPE=edge-commit
         OSTREE_REF="rhel/8/${ARCH}/edge"
         OS_VARIANT="rhel8-unknown"