diff --git a/test/cases/api.sh b/test/cases/api.sh
index 8daa388c3..976aead64 100755
--- a/test/cases/api.sh
+++ b/test/cases/api.sh
@@ -429,6 +429,14 @@ case "$ID-$VERSION_ID" in
       SSH_USER="cloud-user"
     fi
     ;;
+  "centos-9")
+    DISTRO="centos-9"
+    if [[ "$CLOUD_PROVIDER" == "$CLOUD_PROVIDER_AWS" ]]; then
+      SSH_USER="ec2-user"
+    else
+      SSH_USER="cloud-user"
+    fi
+    ;;
 esac
 
 # Only RHEL need subscription block.
diff --git a/test/cases/api_v2.sh b/test/cases/api_v2.sh
index 282cf3fe2..cee6dd58f 100755
--- a/test/cases/api_v2.sh
+++ b/test/cases/api_v2.sh
@@ -289,6 +289,10 @@ case $(set +x; . /etc/os-release; echo "$ID-$VERSION_ID") in
     DISTRO="centos-8"
     SSH_USER="cloud-user"
     ;;
+  "centos-9")
+    DISTRO="centos-9"
+    SSH_USER="cloud-user"
+    ;;
 esac
 
 # Only RHEL need subscription block.
diff --git a/test/cases/filesystem.sh b/test/cases/filesystem.sh
index c9f2d4836..783976bf8 100644
--- a/test/cases/filesystem.sh
+++ b/test/cases/filesystem.sh
@@ -7,10 +7,14 @@ set -euo pipefail
 
 source /etc/os-release
 
-if [[ "${ID}-${VERSION_ID}" != "rhel-8.6" && "${ID}-${VERSION_ID}" != "rhel-9.0" ]]; then
-    echo "$0 is only enabled for rhel-8.6 and rhel-9.0; skipping..."
-    exit 0
-fi
+case "${ID}-${VERSION_ID}" in
+    "rhel-8.6" | "rhel-9.0" | "centos-9")
+        ;;
+    *)
+        echo "$0 is not enabled for ${ID}-${VERSION_ID} skipping..."
+        exit 0
+        ;;
+esac
 
 # Provision the software under test.
 /usr/libexec/osbuild-composer-test/provision.sh
diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index c9bddfcf1..2fbc3cdf5 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.6" | "centos-8")
+    "rhel-8.6" | "centos-8" | "rhel-9.0" | "centos-9")
         CONTAINER_TYPE=edge-container
         CONTAINER_FILENAME=container.tar
         INSTALLER_TYPE=edge-installer
@@ -109,13 +109,6 @@ case "${ID}-${VERSION_ID}" in
         USER_IN_UPGRADE_BP="false"
         INSTALLER_PATH="/run/install/repo/ostree/repo"
         ;;
-    "rhel-9.0")
-        CONTAINER_TYPE=edge-container
-        CONTAINER_FILENAME=container.tar
-        INSTALLER_TYPE=edge-installer
-        INSTALLER_FILENAME=installer.iso
-        USER_IN_UPGRADE_BP="true"
-        ;;
     *)
         echo "unsupported distro: ${ID}-${VERSION_ID}"
         exit 1;;
diff --git a/test/cases/ostree-raw-image.sh b/test/cases/ostree-raw-image.sh
index 411354ceb..5c6cdd1a9 100755
--- a/test/cases/ostree-raw-image.sh
+++ b/test/cases/ostree-raw-image.sh
@@ -85,7 +85,7 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
 SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.6" | "centos-8" | "rhel-9.0")
+    "rhel-8.6" | "centos-8" | "rhel-9.0" | "centos-9")
         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 03e7accb2..920a4048a 100755
--- a/test/cases/ostree-simplified-installer.sh
+++ b/test/cases/ostree-simplified-installer.sh
@@ -94,7 +94,7 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
 SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.6" | "centos-8" | "rhel-9.0")
+    "rhel-8.6" | "centos-8" | "rhel-9.0" | "centos-9")
         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 53dd1f640..ec52e0e64 100755
--- a/test/cases/ostree.sh
+++ b/test/cases/ostree.sh
@@ -35,6 +35,12 @@ case "${ID}-${VERSION_ID}" in
         OS_VARIANT="rhel9.0"
         USER_IN_COMMIT="true"
         BOOT_LOCATION="$COMPOSE_URL/compose/BaseOS/x86_64/os/";;
+    "centos-9")
+        IMAGE_TYPE=edge-commit
+        OSTREE_REF="centos/9/${ARCH}/edge"
+        OS_VARIANT="centos9"
+        USER_IN_COMMIT="true"
+        BOOT_LOCATION="$COMPOSE_URL/compose/BaseOS/x86_64/os/";;
     *)
         echo "unsupported distro: ${ID}-${VERSION_ID}"
         exit 1;;
diff --git a/test/cases/regression-excluded-dependency.sh b/test/cases/regression-excluded-dependency.sh
index f9e699c09..66a67e901 100644
--- a/test/cases/regression-excluded-dependency.sh
+++ b/test/cases/regression-excluded-dependency.sh
@@ -17,10 +17,15 @@ source /etc/os-release
 # Provision the software under test.
 /usr/libexec/osbuild-composer-test/provision.sh
 
-if [[ "${ID}-${VERSION_ID}" != "rhel-8.6" && "${ID}-${VERSION_ID}" != "rhel-9.0" ]]; then
-    echo "$0 is only enabled for rhel-8.6 and rhel-9.0; skipping..."
-    exit 0
-fi
+case "${ID}-${VERSION_ID}" in
+    "rhel-8.6" | "rhel-9.0" | "centos-9")
+        ;;
+    *)
+        echo "$0 is not enabled for ${ID}-${VERSION_ID} skipping..."
+        exit 0
+        ;;
+esac
+
 
 set -xeuo pipefail