diff --git a/lib/fog/openstack/models/identity/users.rb b/lib/fog/openstack/models/identity/users.rb
index f34f97923..0a16a1168 100644
--- a/lib/fog/openstack/models/identity/users.rb
+++ b/lib/fog/openstack/models/identity/users.rb
@@ -7,10 +7,9 @@ module Fog
       class Users < Fog::Collection
         model Fog::Identity::OpenStack::User
 
-        attribute :tenant
+        attribute :tenant_id
 
         def all
-          tenant_id = tenant.nil? ? nil : tenant.id
           load(connection.list_users(tenant_id).body['users'])
         end