diff --git a/test/cases/aws.sh b/test/cases/aws.sh
index 6e45a0d32..56384d071 100755
--- a/test/cases/aws.sh
+++ b/test/cases/aws.sh
@@ -255,19 +255,25 @@ fi
 
 cp "${CIV_CONFIG_FILE}" "${TEMPDIR}/civ_config.yml"
 
-sudo "${CONTAINER_RUNTIME}" run \
-    -a stdout -a stderr \
-    -e AWS_ACCESS_KEY_ID="${V2_AWS_ACCESS_KEY_ID}" \
-    -e AWS_SECRET_ACCESS_KEY="${V2_AWS_SECRET_ACCESS_KEY}" \
-    -e AWS_REGION="${AWS_REGION}" \
-    -e JIRA_PAT="${JIRA_PAT}" \
-    -v "${TEMPDIR}":/tmp:Z \
-    "${CONTAINER_CLOUD_IMAGE_VAL}" \
-    python cloud-image-val.py \
-    -c /tmp/civ_config.yml \
-    && RESULTS=1 || RESULTS=0
+# temporary workaround for
+# https://issues.redhat.com/browse/CLOUDX-488
+if nvrGreaterOrEqual "osbuild-composer" "83"; then
+    sudo "${CONTAINER_RUNTIME}" run \
+        -a stdout -a stderr \
+        -e AWS_ACCESS_KEY_ID="${V2_AWS_ACCESS_KEY_ID}" \
+        -e AWS_SECRET_ACCESS_KEY="${V2_AWS_SECRET_ACCESS_KEY}" \
+        -e AWS_REGION="${AWS_REGION}" \
+        -e JIRA_PAT="${JIRA_PAT}" \
+        -v "${TEMPDIR}":/tmp:Z \
+        "${CONTAINER_CLOUD_IMAGE_VAL}" \
+        python cloud-image-val.py \
+        -c /tmp/civ_config.yml \
+        && RESULTS=1 || RESULTS=0
 
-mv "${TEMPDIR}"/report.html "${ARTIFACTS}"
+    mv "${TEMPDIR}"/report.html "${ARTIFACTS}"
+else
+    RESULTS=1
+fi
 
 # Clean up our mess.
 greenprint "🧼 Cleaning up"
diff --git a/test/cases/azure.sh b/test/cases/azure.sh
index fa8501889..09c23f659 100755
--- a/test/cases/azure.sh
+++ b/test/cases/azure.sh
@@ -232,20 +232,26 @@ fi
 
 cp "${CIV_CONFIG_FILE}" "${TEMPDIR}/civ_config.yml"
 
-sudo "${CONTAINER_RUNTIME}" run \
-    -a stdout -a stderr \
-    -e ARM_CLIENT_ID="${V2_AZURE_CLIENT_ID}" \
-    -e ARM_CLIENT_SECRET="${V2_AZURE_CLIENT_SECRET}" \
-    -e ARM_SUBSCRIPTION_ID="${AZURE_SUBSCRIPTION_ID}" \
-    -e ARM_TENANT_ID="${AZURE_TENANT_ID}" \
-    -e JIRA_PAT="${JIRA_PAT}" \
-    -v "${TEMPDIR}":/tmp:Z \
-    "${CONTAINER_CLOUD_IMAGE_VAL}" \
-    python cloud-image-val.py \
-    -c /tmp/civ_config.yml \
-    && RESULTS=1 || RESULTS=0
+# temporary workaround for
+# https://issues.redhat.com/browse/CLOUDX-488
+if nvrGreaterOrEqual "osbuild-composer" "83"; then
+    sudo "${CONTAINER_RUNTIME}" run \
+        -a stdout -a stderr \
+        -e ARM_CLIENT_ID="${V2_AZURE_CLIENT_ID}" \
+        -e ARM_CLIENT_SECRET="${V2_AZURE_CLIENT_SECRET}" \
+        -e ARM_SUBSCRIPTION_ID="${AZURE_SUBSCRIPTION_ID}" \
+        -e ARM_TENANT_ID="${AZURE_TENANT_ID}" \
+        -e JIRA_PAT="${JIRA_PAT}" \
+        -v "${TEMPDIR}":/tmp:Z \
+        "${CONTAINER_CLOUD_IMAGE_VAL}" \
+        python cloud-image-val.py \
+        -c /tmp/civ_config.yml \
+        && RESULTS=1 || RESULTS=0
 
-mv "${TEMPDIR}"/report.html "${ARTIFACTS}"
+    mv "${TEMPDIR}"/report.html "${ARTIFACTS}"
+else
+    RESULTS=1
+fi
 
 # Also delete the compose so we don't run out of disk space
 sudo composer-cli compose delete "${COMPOSE_ID}" > /dev/null