diff --git a/tests/test-container-engine-migration.sh b/tests/test-container-engine-migration.sh
index 76b97941e3..a0575f3f5a 100644
--- a/tests/test-container-engine-migration.sh
+++ b/tests/test-container-engine-migration.sh
@@ -19,7 +19,7 @@ function create_instance {
         server_create_extra="${server_create_extra} --config-drive True"
     fi
 
-    openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
+    openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
     # If the status is not ACTIVE, print info and exit 1
     if [[ $(openstack server show ${name} -f value -c status) != "ACTIVE" ]]; then
         echo "FAILED: Instance is not active"
diff --git a/tests/test-core-openstack.sh b/tests/test-core-openstack.sh
index d688214a72..e191201c69 100755
--- a/tests/test-core-openstack.sh
+++ b/tests/test-core-openstack.sh
@@ -167,7 +167,7 @@ function create_instance {
         server_create_extra="${server_create_extra} --config-drive True"
     fi
 
-    openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
+    openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
     # If the status is not ACTIVE, print info and exit 1
     if [[ $(openstack server show ${name} -f value -c status) != "ACTIVE" ]]; then
         echo "FAILED: Instance is not active"
@@ -179,7 +179,7 @@ function create_instance {
 function resize_instance {
     local name=$1
 
-    openstack server resize --flavor m2.tiny --wait ${name}
+    openstack server resize --flavor c2.tiny --wait ${name}
     # If the status is not VERIFY_RESIZE, print info and exit 1
     if [[ $(openstack server show ${name} -f value -c status) != "VERIFY_RESIZE" ]]; then
         echo "FAILED: Instance is not resized"
@@ -439,7 +439,7 @@ function test_internal_dns_integration {
         SERVER_NAME="my_vm"
         SERVER_NAME_SANITIZED=$(echo ${SERVER_NAME} | sed -e 's/_/-/g')
 
-        openstack server create --image cirros --flavor m1.tiny --network dns-test-network ${SERVER_NAME}
+        openstack server create --image cirros --flavor c1.tiny --network dns-test-network ${SERVER_NAME}
 
         SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
         attempt=0
diff --git a/tests/test-magnum.sh b/tests/test-magnum.sh
index 7a71b3cd7a..56e8a3a6aa 100755
--- a/tests/test-magnum.sh
+++ b/tests/test-magnum.sh
@@ -58,7 +58,7 @@ function test_designate {
     openstack router set --external-gateway public1 router-dns-test
     openstack router add subnet router-dns-test tenant-dns-test
 
-    openstack server create --image cirros --flavor m1.tiny --network tenant-dns-test  ${SERVER_NAME}
+    openstack server create --image cirros --flavor c1.tiny --network tenant-dns-test  ${SERVER_NAME}
 
     SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
     attempt=0
@@ -131,7 +131,7 @@ EOF
 
     DNS_DOMAIN="fixed.sink.example.org."
     SERVER_NAME="sink-server"
-    openstack server create --image cirros --flavor m1.tiny --network tenant-dns-test ${SERVER_NAME}
+    openstack server create --image cirros --flavor c1.tiny --network tenant-dns-test ${SERVER_NAME}
 
     check_if_resolvable "${DNS_DOMAIN}" "${SERVER_NAME}.${DNS_DOMAIN}" "A"
 
diff --git a/tests/test-octavia.sh b/tests/test-octavia.sh
index 311f18f2d3..07c4ef0b58 100644
--- a/tests/test-octavia.sh
+++ b/tests/test-octavia.sh
@@ -30,7 +30,7 @@ function test_octavia {
     # Create a Loadblanacer
     openstack loadbalancer create --name lb --vip-subnet-id demo-subnet --wait
     # Create a server to act as a backend.
-    openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net lb_member --wait
+    openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net lb_member --wait
     member_fip=$(openstack floating ip create public1 -f value -c floating_ip_address)
     openstack server add floating ip lb_member ${member_fip}
     member_ip=$(openstack floating ip show ${member_fip} -f value -c fixed_ip_address)
@@ -132,7 +132,7 @@ function test_internal_dns_integration {
         SERVER_NAME="my_vm"
         SERVER_NAME_SANITIZED=$(echo ${SERVER_NAME} | sed -e 's/_/-/g')
 
-        openstack server create --image cirros --flavor m1.tiny --network dns-test-network ${SERVER_NAME}
+        openstack server create --image cirros --flavor c1.tiny --network dns-test-network ${SERVER_NAME}
 
         SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
         attempt=0
diff --git a/tests/test-ovn.sh b/tests/test-ovn.sh
index fbe91eeca7..a9d77a95ae 100755
--- a/tests/test-ovn.sh
+++ b/tests/test-ovn.sh
@@ -47,7 +47,7 @@ function test_octavia {
     openstack loadbalancer list
 
     # Create a server to act as a backend
-    openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net lb_member --wait
+    openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net lb_member --wait
     member_fip=$(openstack floating ip create public1 -f value -c floating_ip_address)
     openstack server add floating ip lb_member ${member_fip}
     member_ip=$(openstack floating ip show ${member_fip} -f value -c fixed_ip_address)