diff --git a/test/image-tests/aws.sh b/test/image-tests/aws.sh
index 4617947e4..9bf20f422 100755
--- a/test/image-tests/aws.sh
+++ b/test/image-tests/aws.sh
@@ -81,7 +81,7 @@ get_compose_log () {
 # Get the compose metadata.
 get_compose_metadata () {
     COMPOSE_ID=$1
-    METADATA_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.log
+    METADATA_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.json
 
     # Download the metadata.
     sudo composer-cli compose metadata $COMPOSE_ID > /dev/null
diff --git a/test/image-tests/qemu.sh b/test/image-tests/qemu.sh
index 1df337540..ee54fe7df 100755
--- a/test/image-tests/qemu.sh
+++ b/test/image-tests/qemu.sh
@@ -95,7 +95,7 @@ smoke_test_check () {
 # Get the compose log.
 get_compose_log () {
     COMPOSE_ID=$1
-    LOG_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.log
+    LOG_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-${IMAGE_TYPE}.log
 
     # Download the logs.
     sudo composer-cli compose log $COMPOSE_ID | tee $LOG_FILE > /dev/null
@@ -104,7 +104,7 @@ get_compose_log () {
 # Get the compose metadata.
 get_compose_metadata () {
     COMPOSE_ID=$1
-    METADATA_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-aws.log
+    METADATA_FILE=${WORKSPACE}/osbuild-${ID}-${VERSION_ID}-${IMAGE_TYPE}.json
 
     # Download the metadata.
     sudo composer-cli compose metadata $COMPOSE_ID > /dev/null