diff --git a/contrib/devstack/lib/mistral b/contrib/devstack/lib/mistral
index 823bb0fcc..20a1a0550 100644
--- a/contrib/devstack/lib/mistral
+++ b/contrib/devstack/lib/mistral
@@ -73,18 +73,6 @@ function create_mistral_accounts {
         --user $MISTRAL_USER
 
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-        MISTRAL_SERVICE=$(openstack service create \
-            mistral \
-            --type=workflow \
-            --description="Workflow Service" \
-            | grep " id " | get_field 2)
-        openstack endpoint create \
-            $MISTRAL_SERVICE \
-            --region RegionOne \
-            --publicurl "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v1" \
-            --adminurl "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v1" \
-            --internalurl "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v1"
-
         MISTRAL_SERVICE_V2=$(openstack service create \
             mistral \
             --type=workflowv2 \
diff --git a/functionaltests/run_tests.sh b/functionaltests/run_tests.sh
index 9b9308d22..49b31e08b 100755
--- a/functionaltests/run_tests.sh
+++ b/functionaltests/run_tests.sh
@@ -15,7 +15,7 @@
 # How many seconds to wait for the API to be responding before giving up
 API_RESPONDING_TIMEOUT=20
 
-if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:8989/v1/ 2>/dev/null | grep -q 'Authentication required' ; do sleep 1; done"; then
+if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:8989/v2/ 2>/dev/null | grep -q 'Authentication required' ; do sleep 1; done"; then
     echo "Mistral API failed to respond within ${API_RESPONDING_TIMEOUT} seconds"
     exit 1
 fi