diff --git a/tests/controller_create_image_and_flavor.sh b/tests/controller_create_image_and_flavor.sh
index b77a7d0..a766c7c 100644
--- a/tests/controller_create_image_and_flavor.sh
+++ b/tests/controller_create_image_and_flavor.sh
@@ -9,7 +9,7 @@ source openrc
 
 #Required to be able to install iperf package since Cirros image does not provide it
 curl https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img -o $UBUNTU_IMAGE
-glance image-create --name $IMAGE_NAME --file $UBUNTU_IMAGE --disk-format qcow2 --container-format bare --visibility public --progress
+openstack image create $IMAGE_NAME --file $UBUNTU_IMAGE --disk-format qcow2 --container-format bare --public
 nova flavor-create m1.vm_hugepages auto 512 3 1
 nova flavor-key m1.vm_hugepages set hw:mem_page_size=large
 
diff --git a/tests/controller_launch_instance.sh b/tests/controller_launch_instance.sh
index e12ab8e..0992cd1 100644
--- a/tests/controller_launch_instance.sh
+++ b/tests/controller_launch_instance.sh
@@ -11,7 +11,7 @@ while [ $(nova list | grep test_vm | grep BUILD | wc -l) -eq 1 ]; do
     sleep 1;
 done
 
-STATUS=$(nova show test_vm | grep status | awk '{print $4}')
+STATUS=$(nova list | grep test_vm | awk '{print $6}')
 
 if [[ ${STATUS} == "ACTIVE" ]]; then
     echo "Wait 2 minutes to make sure that vm cloud-init has finished"