diff --git a/manifests/identity.pp b/manifests/identity.pp
index 9c4d2b4f..66e0a10c 100644
--- a/manifests/identity.pp
+++ b/manifests/identity.pp
@@ -399,7 +399,7 @@ class cloud::identity (
     memcache_servers => $memcache_servers,
     sql_connection   => "mysql://${encoded_user}:${encoded_password}@${keystone_db_host}/keystone",
     token_driver     => 'keystone.token.backends.memcache.Token',
-    token_provider   => 'keystone.token.providers.pki.Provider',
+    token_provider   => 'keystone.token.providers.uuid.Provider',
     use_syslog       => true,
     verbose          => $verbose,
     bind_host        => $api_eth,
diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb
index 49cec0bc..bc55cdb4 100644
--- a/spec/classes/cloud_identity_spec.rb
+++ b/spec/classes/cloud_identity_spec.rb
@@ -101,7 +101,7 @@ describe 'cloud::identity' do
         :memcache_servers => ['10.0.0.1','10.0.0.2'],
         :sql_connection   => 'mysql://keystone:secrete@10.0.0.1/keystone',
         :token_driver     => 'keystone.token.backends.memcache.Token',
-        :token_provider   => 'keystone.token.providers.pki.Provider',
+        :token_provider   => 'keystone.token.providers.uuid.Provider',
         :use_syslog       => true,
         :bind_host        => '10.0.0.1',
         :public_port      => '5000',