diff --git a/roles/run-evacuate-hook/files/setup_evacuate_resources.sh b/roles/run-evacuate-hook/files/setup_evacuate_resources.sh
index c8c385d7ff..814b5a1d85 100755
--- a/roles/run-evacuate-hook/files/setup_evacuate_resources.sh
+++ b/roles/run-evacuate-hook/files/setup_evacuate_resources.sh
@@ -11,11 +11,10 @@ echo "Creating ephemeral test server on subnode"
 openstack --os-compute-api-version 2.74 server create --image ${image_id} --flavor ${flavor_id} \
 --nic net-id=${network_id} --host $SUBNODE_HOSTNAME --wait evacuate-test
 
-# TODO(lyarwood) Use osc to launch the bfv volume
 echo "Creating boot from volume test server on subnode"
-nova --os-compute-api-version 2.74 boot --flavor ${flavor_id} --poll \
---block-device id=${image_id},source=image,dest=volume,size=1,bootindex=0,shutdown=remove \
---nic net-id=${network_id} --host ${SUBNODE_HOSTNAME} evacuate-bfv-test
+openstack --os-compute-api-version 2.74  server create --flavor ${flavor_id} \
+--block-device source_type=image,uuid=${image_id},destination_type=volume,volume_size=1,boot_index=0,delete_on_termination=true \
+--network ${network_id} --host ${SUBNODE_HOSTNAME} --wait evacuate-bfv-test
 
 echo "Forcing down the subnode so we can evacuate from it"
 openstack --os-compute-api-version 2.11 compute service set --down ${SUBNODE_HOSTNAME} nova-compute
diff --git a/roles/run-evacuate-hook/files/test_evacuate.sh b/roles/run-evacuate-hook/files/test_evacuate.sh
index bdf8d92441..184613cf89 100755
--- a/roles/run-evacuate-hook/files/test_evacuate.sh
+++ b/roles/run-evacuate-hook/files/test_evacuate.sh
@@ -22,7 +22,10 @@ done
 function evacuate_and_wait_for_active() {
     local server="$1"
 
-    nova evacuate ${server}
+    # Shared storage will be auto-calculated with -–os-compute-api-version 2.14
+    # and greater and --shared-storage should not be used with later
+    # microversions.
+    openstack --os-compute-api-version 2.14 server evacuate ${server}
     # Wait for the instance to go into ACTIVE state from the evacuate.
     count=0
     status=$(openstack server show ${server} -f value -c status)
diff --git a/roles/run-evacuate-hook/files/test_negative_evacuate.sh b/roles/run-evacuate-hook/files/test_negative_evacuate.sh
index b1f5f7a4af..0f9041402d 100755
--- a/roles/run-evacuate-hook/files/test_negative_evacuate.sh
+++ b/roles/run-evacuate-hook/files/test_negative_evacuate.sh
@@ -16,8 +16,7 @@ function evacuate_and_wait_for_error() {
     local server="$1"
 
     echo "Forcing evacuate of ${server} to local host"
-    # TODO(mriedem): Use OSC when it supports evacuate.
-    nova --os-compute-api-version "2.67" evacuate --force ${server} ${CONTROLLER_HOSTNAME}
+    openstack --os-compute-api-version 2.67 server evacuate --host ${CONTROLLER_HOSTNAME} ${server}
     # Wait for the instance to go into ERROR state from the failed evacuate.
     count=0
     status=$(openstack server show ${server} -f value -c status)