diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 5a9d6071..e6a0665d 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -14,7 +14,7 @@
 #
 # [*auth_url*]
 #   (Optional) The URL to use for authentication.
-#   Defaults to 'http://localhost:35357'.
+#   Defaults to 'http://localhost:5000'.
 #
 # [*project_name*]
 #   (Optional) Service project name
@@ -192,7 +192,7 @@
 class cinder::keystone::authtoken(
   $username                       = 'cinder',
   $password                       = $::os_service_default,
-  $auth_url                       = 'http://localhost:35357',
+  $auth_url                       = 'http://localhost:5000',
   $project_name                   = 'services',
   $user_domain_name               = 'Default',
   $project_domain_name            = 'Default',
diff --git a/spec/classes/cinder_backup_swift_spec.rb b/spec/classes/cinder_backup_swift_spec.rb
index 97b75158..ac9ba842 100644
--- a/spec/classes/cinder_backup_swift_spec.rb
+++ b/spec/classes/cinder_backup_swift_spec.rb
@@ -61,7 +61,7 @@ describe 'cinder::backup::swift' do
     context 'when overriding default parameters' do
       before :each do
         params.merge!(:backup_swift_url => 'https://controller2:8080/v1/AUTH_')
-        params.merge!(:backup_swift_auth_url => 'https://controller2:35357')
+        params.merge!(:backup_swift_auth_url => 'https://controller2:5000')
         params.merge!(:backup_swift_container => 'toto')
         params.merge!(:backup_swift_object_size => '123')
         params.merge!(:backup_swift_retry_attempts => '99')
diff --git a/spec/classes/cinder_keystone_authtoken_spec.rb b/spec/classes/cinder_keystone_authtoken_spec.rb
index ff9c45b9..3f837f36 100644
--- a/spec/classes/cinder_keystone_authtoken_spec.rb
+++ b/spec/classes/cinder_keystone_authtoken_spec.rb
@@ -13,7 +13,7 @@ describe 'cinder::keystone::authtoken' do
       it 'configure keystone_authtoken' do
         is_expected.to contain_cinder_config('keystone_authtoken/username').with_value('cinder')
         is_expected.to contain_cinder_config('keystone_authtoken/password').with_value('cinder_password')
-        is_expected.to contain_cinder_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
+        is_expected.to contain_cinder_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
         is_expected.to contain_cinder_config('keystone_authtoken/project_name').with_value('services')
         is_expected.to contain_cinder_config('keystone_authtoken/user_domain_name').with_value('Default')
         is_expected.to contain_cinder_config('keystone_authtoken/project_domain_name').with_value('Default')
@@ -53,7 +53,7 @@ describe 'cinder::keystone::authtoken' do
           :www_authenticate_uri                 => 'https://10.0.0.1:9999/',
           :username                             => 'myuser',
           :password                             => 'mypasswd',
-          :auth_url                             => 'https://127.0.0.1:35357',
+          :auth_url                             => 'https://127.0.0.1:5000',
           :project_name                         => 'service_project',
           :user_domain_name                     => 'domainX',
           :project_domain_name                  => 'domainX',
diff --git a/spec/unit/provider/cinder_spec.rb b/spec/unit/provider/cinder_spec.rb
index 3e2c46aa..ebc48cd2 100644
--- a/spec/unit/provider/cinder_spec.rb
+++ b/spec/unit/provider/cinder_spec.rb
@@ -24,7 +24,7 @@ describe Puppet::Provider::Cinder do
 
     it 'should read conf file with all sections' do
       creds_hash = {
-        'www_authenticate_uri' => 'https://192.168.56.210:35357/v2.0/',
+        'www_authenticate_uri' => 'https://192.168.56.210:5000/v2.0/',
         'project_name'         => 'admin_tenant',
         'username'             => 'admin',
         'password'             => 'password',
@@ -33,7 +33,7 @@ describe Puppet::Provider::Cinder do
       }
       mock = {
         'keystone_authtoken' => {
-          'www_authenticate_uri' => 'https://192.168.56.210:35357/v2.0/',
+          'www_authenticate_uri' => 'https://192.168.56.210:5000/v2.0/',
           'project_name'         => 'admin_tenant',
           'username'             => 'admin',
           'password'             => 'password',