diff --git a/bin/cinder-keystone-setup b/bin/cinder-keystone-setup
deleted file mode 100755
index 19165fd2c..000000000
--- a/bin/cinder-keystone-setup
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set +e
-
-SERVICE_PASSWORD='servicepass'
-CINDER_USERNAME='cinder'
-
-source `dirname $0`/heat-keystone-setup
-
-ADMIN_ROLE=$(get_data 2 admin 1 keystone role-list)
-SERVICE_TENANT=$(get_data 2 service 1 keystone tenant-list)
-
-CINDER_USERID=$(get_user $CINDER_USERNAME)
-add_role $CINDER_USERID $SERVICE_TENANT $ADMIN_ROLE $CINDER_USERNAME
-
-CINDER_SERVICE=$(get_service cinder volume "Cinder Volume Service")
-add_endpoint $CINDER_SERVICE 'http://localhost:8776/v1/$(tenant_id)s'
diff --git a/setup.cfg b/setup.cfg
index 962af3eb5..241fce821 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,7 +22,6 @@ classifier =
 packages =
     heat
 scripts =
-    bin/cinder-keystone-setup
     bin/heat-api
     bin/heat-api-cfn
     bin/heat-api-cloudwatch