2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index fa4a54df6..3579909c5 100755
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -20,7 +20,7 @@ cleanup()
     fi
 
     for image in $(openstack image list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \
-        -e yardstick-vivid-kernel | awk '{print $2}'); do
+        | awk '{print $2}'); do
         echo "Deleting image $image..."
         openstack image delete $image || true
     done
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index a68ffe135..4b8f2c0e1 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -117,7 +117,7 @@ load_yardstick_image()
     if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
         output=$(eval openstack image create \
             --public \
-            --disk-format root-tar \
+            --disk-format raw \
             --container-format bare \
             ${EXTRA_PARAMS} \
             --file ${RAW_IMAGE} \