diff --git a/lib/fog/hp/cdn.rb b/lib/fog/hp/cdn.rb
index 324ecb437..5f029b175 100644
--- a/lib/fog/hp/cdn.rb
+++ b/lib/fog/hp/cdn.rb
@@ -5,8 +5,8 @@ module Fog
   module CDN
     class HP < Fog::Service
 
-      requires    :hp_secret_key, :hp_account_id
-      recognizes  :hp_auth_uri, :hp_cdn_uri, :persistent, :connection_options, :hp_use_upass_auth_style, :hp_tenant_id, :hp_auth_version
+      requires    :hp_secret_key, :hp_account_id, :hp_tenant_id
+      recognizes  :hp_auth_uri, :hp_cdn_uri, :persistent, :connection_options, :hp_use_upass_auth_style, :hp_auth_version
 
       model_path   'fog/hp/models/cdn'
 
diff --git a/lib/fog/hp/compute.rb b/lib/fog/hp/compute.rb
index 57a4eb4a6..2faf7eacd 100644
--- a/lib/fog/hp/compute.rb
+++ b/lib/fog/hp/compute.rb
@@ -5,8 +5,8 @@ module Fog
   module Compute
     class HP < Fog::Service
 
-      requires    :hp_secret_key, :hp_account_id
-      recognizes  :hp_auth_uri, :hp_servicenet, :persistent, :connection_options, :hp_use_upass_auth_style, :hp_tenant_id, :hp_auth_version, :hp_avl_zone
+      requires    :hp_secret_key, :hp_account_id, :hp_tenant_id
+      recognizes  :hp_auth_uri, :hp_servicenet, :persistent, :connection_options, :hp_use_upass_auth_style, :hp_auth_version, :hp_avl_zone
 
       model_path 'fog/hp/models/compute'
       model       :address
diff --git a/lib/fog/hp/storage.rb b/lib/fog/hp/storage.rb
index c9fded02e..fa8c74416 100644
--- a/lib/fog/hp/storage.rb
+++ b/lib/fog/hp/storage.rb
@@ -5,8 +5,8 @@ module Fog
   module Storage
     class HP < Fog::Service
 
-      requires    :hp_secret_key, :hp_account_id
-      recognizes  :hp_auth_uri, :hp_servicenet, :hp_cdn_ssl, :hp_cdn_uri, :persistent, :connection_options, :hp_use_upass_auth_style, :hp_tenant_id, :hp_auth_version
+      requires    :hp_secret_key, :hp_account_id, :hp_tenant_id
+      recognizes  :hp_auth_uri, :hp_servicenet, :hp_cdn_ssl, :hp_cdn_uri, :persistent, :connection_options, :hp_use_upass_auth_style, :hp_auth_version
 
       model_path 'fog/hp/models/storage'
       model       :directory