diff --git a/sensu/files/checks/check_cinder_api.sh b/sensu/files/checks/check_cinder_api.sh
index 0aa9e06..87b608d 100644
--- a/sensu/files/checks/check_cinder_api.sh
+++ b/sensu/files/checks/check_cinder_api.sh
@@ -55,7 +55,7 @@
 fi
 
 START=`date +%s`
-QUOTAS=$(curl -s -H "X-Auth-Token: $TOKEN" $HOST:8776/v1/$TENANT_ID/os-quota-sets/$TENANT/defaults | grep "gigabytes")
+QUOTAS=$(cinder --os-username $USER --os-password $PASSWD --os-tenant-name $TENANT --os-auth-url $HOST:5000/v2.0 quota-show $TENANT_ID | grep "gigabytes")
 END=`date +%s`
 
 LIST_TIME=$[END-START]
diff --git a/sensu/files/checks/check_cinder_services.sh b/sensu/files/checks/check_cinder_services.sh
index e294869..8948dfd 100755
--- a/sensu/files/checks/check_cinder_services.sh
+++ b/sensu/files/checks/check_cinder_services.sh
@@ -39,7 +39,7 @@
     exit_critical "Unknown error."
 fi
 
-read -ra cinder_state_down <<< $(cinder --os-username $user --os-password $passwd --os-tenant-name $tenant --os-auth-url $host service-list | head -n -1 | tr -d "|" | awk '/'down'/ {print "Service " $1 " on " $2 " is DOWN" ";"}')
+read -ra cinder_state_down <<< $(cinder --os-username $user --os-password $passwd --os-tenant-name $tenant --os-auth-url $host service-list | head -n -1 | tr -d "|" | grep enabled | awk '/'down'/ {print "Service " $1 " on " $2 " is DOWN" ";"}')
 
 EXITVAL=0