diff --git a/metadata.rb b/metadata.rb
index 0fcaaec..83e449e 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -11,7 +11,7 @@ recipe 'openstack-integration-test::setup', 'Installs and configures Tempest'
   supports os
 end
 
-depends 'openstack-common', '>= 11.0.0'
+depends 'openstack-common', '>= 11.5.0'
 depends 'openstack-identity', '>= 11.0.0'
 depends 'openstack-image', '>= 11.0.0'
 depends 'openstack-compute', '>= 11.0.0'
diff --git a/recipes/setup.rb b/recipes/setup.rb
index c06abf7..f73c5a4 100644
--- a/recipes/setup.rb
+++ b/recipes/setup.rb
@@ -39,7 +39,7 @@ identity_admin_endpoint = admin_endpoint 'identity-admin'
 # Since this is testing things from the user's perspective,
 # use the public identity endpoint
 identity_api_endpoint   = public_endpoint 'identity-api'
-bootstrap_token         = get_secret 'openstack_identity_bootstrap_token'
+bootstrap_token         = get_password 'token', 'openstack_identity_bootstrap_token'
 auth_uri                = ::URI.decode identity_admin_endpoint.to_s
 admin_pass              = get_password 'user', node['openstack']['identity']['admin_user']
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 190237c..39e3ac8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -28,8 +28,8 @@ shared_context 'tempest-stubs' do
         'OS_AUTH_URL'    => 'http://127.0.0.1:35357/v2.0'
       }
 
-    Chef::Recipe.any_instance.stub(:get_secret)
-      .with('openstack_identity_bootstrap_token')
+    Chef::Recipe.any_instance.stub(:get_password)
+      .with('token', 'openstack_identity_bootstrap_token')
       .and_return('bootstrap-token')
     Chef::Recipe.any_instance.stub(:get_password)
       .with('user', 'admin')