diff --git a/test/cases/image_tests.sh b/test/cases/image_tests.sh
index 01f2e5d43..1912546cd 100755
--- a/test/cases/image_tests.sh
+++ b/test/cases/image_tests.sh
@@ -22,7 +22,7 @@ fi
 
 # Skip 'selinux/contect-mismatch' part of the image-info report on RHEL-8.
 # https://bugzilla.redhat.com/show_bug.cgi?id=1973754
-if [[ "${DISTRO_CODE}" =~ "rhel_8" ]]; then
+if [[ "${DISTRO_CODE}" =~ "rhel-8" ]]; then
     IMAGE_TEST_CASE_RUNNER="${IMAGE_TEST_CASE_RUNNER} -skip-selinux-ctx-check"
 fi
 
diff --git a/test/cases/koji.sh b/test/cases/koji.sh
index 7083b82e9..6ec581f2d 100755
--- a/test/cases/koji.sh
+++ b/test/cases/koji.sh
@@ -14,9 +14,6 @@ function greenprint {
 # Provision the software under test.
 /usr/libexec/osbuild-composer-test/provision.sh
 
-greenprint "Defining distro selector"
-DISTRO_SELECTOR="${DISTRO_CODE//_/-}"
-
 greenprint "Starting containers"
 sudo /usr/libexec/osbuild-composer-test/run-koji-container.sh start
 
@@ -48,7 +45,7 @@ greenprint "Creating Koji task"
 koji --server=http://localhost:8080/kojihub --user kojiadmin --password kojipass --authtype=password make-task image
 
 greenprint "Pushing compose to Koji"
-sudo /usr/libexec/osbuild-composer-test/koji-compose.py "$DISTRO_SELECTOR" "${ARCH}"
+sudo /usr/libexec/osbuild-composer-test/koji-compose.py "$DISTRO_CODE" "${ARCH}"
 
 greenprint "Show Koji task"
 koji --server=http://localhost:8080/kojihub taskinfo 1
diff --git a/test/cases/libvirt.sh b/test/cases/libvirt.sh
index 1b378c0cc..a541bf2c1 100644
--- a/test/cases/libvirt.sh
+++ b/test/cases/libvirt.sh
@@ -13,7 +13,7 @@ source /usr/libexec/osbuild-composer-test/set-env-variables.sh
 /usr/libexec/osbuild-composer-test/libvirt_test.sh openstack
 
 # RHEL 8.4 and Centos Stream 8 images also supports uefi, check that
-if [[ "$DISTRO_CODE" == "rhel_84" || "$DISTRO_CODE" == "rhel_85" || "$DISTRO_CODE" == "centos_8"  || "$DISTRO_CODE" == "rhel_90" ]]; then
+if [[ "$DISTRO_CODE" == "rhel-84" || "$DISTRO_CODE" == "rhel-85" || "$DISTRO_CODE" == "centos-8" || "$DISTRO_CODE" == "rhel-90" ]]; then
   echo "🐄 Booting qcow2 image in UEFI mode on RHEL/Centos Stream"
   /usr/libexec/osbuild-composer-test/libvirt_test.sh qcow2 uefi
 fi
diff --git a/tools/set-env-variables.sh b/tools/set-env-variables.sh
index 91e616297..50f8a2401 100644
--- a/tools/set-env-variables.sh
+++ b/tools/set-env-variables.sh
@@ -4,4 +4,4 @@
 
 source /etc/os-release
 ARCH=$(uname -m)
-DISTRO_CODE="${DISTRO_CODE:-${ID}_${VERSION_ID//./}}"
+DISTRO_CODE="${DISTRO_CODE:-${ID}-${VERSION_ID//./}}"