diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 0b99a395d..4bd223595 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -180,11 +180,7 @@ labels:
 providers:
   - name: devstack
     region-name: '$REGION_NAME'
-    service-type: 'compute'
-    username: 'demo'
-    project-name: 'demo'
-    password: '$ADMIN_PASSWORD'
-    auth-url: '$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION'
+    cloud: devstack
     api-timeout: 60
     # Long boot timeout to deal with potentially nested virt.
     boot-timeout: 600
diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh
index 5267601e9..3583fcf19 100755
--- a/tools/check_devstack_plugin.sh
+++ b/tools/check_devstack_plugin.sh
@@ -1,5 +1,8 @@
 #!/bin/bash -x
 
+# Do this so that the nodepool commands below can find the
+# clouds.yaml file
+export OS_CLIENT_CONFIG_FILE=${OS_CLIENT_CONFIG_FILE:-/opt/stack/new/.config/openstack/clouds.yaml}
 NODEPOOL_CONFIG=${NODEPOOL_CONFIG:-/etc/nodepool/nodepool.yaml}
 NODEPOOL_SECURE=${NODEPOOL_SECURE:-/etc/nodepool/secure.conf}
 NODEPOOL="nodepool -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE"
@@ -9,11 +12,11 @@ function waitforimage {
     state='ready'
 
     while ! $NODEPOOL image-list | grep $name | grep $state; do
-	$NODEPOOL image-list > /tmp/.nodepool-image-list.txt
-	$NODEPOOL list > /tmp/.nodepool-list.txt
-	sudo mv /tmp/.nodepool-image-list.txt $WORKSPACE/logs/nodepool-image-list.txt
-	sudo mv /tmp/.nodepool-list.txt $WORKSPACE/logs/nodepool-list.txt
-	sleep 10
+        $NODEPOOL image-list > /tmp/.nodepool-image-list.txt
+        $NODEPOOL list > /tmp/.nodepool-list.txt
+        sudo mv /tmp/.nodepool-image-list.txt $WORKSPACE/logs/nodepool-image-list.txt
+        sudo mv /tmp/.nodepool-list.txt $WORKSPACE/logs/nodepool-list.txt
+        sleep 10
     done
 }
 
@@ -22,11 +25,11 @@ function waitfornode {
     state='ready'
 
     while ! $NODEPOOL list | grep $name | grep $state; do
-	$NODEPOOL image-list > /tmp/.nodepool-image-list.txt
-	$NODEPOOL list > /tmp/.nodepool-list.txt
-	sudo mv /tmp/.nodepool-image-list.txt $WORKSPACE/logs/nodepool-image-list.txt
-	sudo mv /tmp/.nodepool-list.txt $WORKSPACE/logs/nodepool-list.txt
-	sleep 10
+        $NODEPOOL image-list > /tmp/.nodepool-image-list.txt
+        $NODEPOOL list > /tmp/.nodepool-list.txt
+        sudo mv /tmp/.nodepool-image-list.txt $WORKSPACE/logs/nodepool-image-list.txt
+        sudo mv /tmp/.nodepool-list.txt $WORKSPACE/logs/nodepool-list.txt
+        sleep 10
     done
 }