diff --git a/lib/fog/rackspace/requests/identity/list_credentials.rb b/lib/fog/rackspace/requests/identity/list_credentials.rb
index 1f8eac1fe..07da4aa28 100644
--- a/lib/fog/rackspace/requests/identity/list_credentials.rb
+++ b/lib/fog/rackspace/requests/identity/list_credentials.rb
@@ -9,7 +9,7 @@ module Fog
             :path => "users/#{user_id}/OS-KSADM/credentials"
           )
 
-          if response.body.include? 'credential'
+          unless response.body['credentials'].is_a?(Array)
             response.body['credentials'] = [response.body['credential']]
             response.body.delete('credential')
           end
diff --git a/lib/fog/rackspace/requests/identity/list_tenants.rb b/lib/fog/rackspace/requests/identity/list_tenants.rb
index 2bc6000d6..04102a48d 100644
--- a/lib/fog/rackspace/requests/identity/list_tenants.rb
+++ b/lib/fog/rackspace/requests/identity/list_tenants.rb
@@ -9,7 +9,7 @@ module Fog
             :path => 'tenants'
           )
 
-          if response.body.include? 'tenant'
+          unless response.body['tenants'].is_a?(Array)
             response.body['tenants'] = [response.body['tenant']]
             response.body.delete('tenant')
           end
diff --git a/lib/fog/rackspace/requests/identity/list_user_roles.rb b/lib/fog/rackspace/requests/identity/list_user_roles.rb
index c0f5dc3b4..5e22bd580 100644
--- a/lib/fog/rackspace/requests/identity/list_user_roles.rb
+++ b/lib/fog/rackspace/requests/identity/list_user_roles.rb
@@ -9,7 +9,7 @@ module Fog
             :path => "users/#{user_id}/roles"
           )
 
-          if response.body.include? 'role'
+          unless response.body['roles'].is_a?(Array)
             response.body['roles'] = [response.body['role']]
             response.body.delete('role')
           end
diff --git a/lib/fog/rackspace/requests/identity/list_users.rb b/lib/fog/rackspace/requests/identity/list_users.rb
index a581d9f0b..f4dfd073e 100644
--- a/lib/fog/rackspace/requests/identity/list_users.rb
+++ b/lib/fog/rackspace/requests/identity/list_users.rb
@@ -9,7 +9,7 @@ module Fog
             :path => 'users'
           )
 
-          if response.body.include? 'user'
+          unless response.body['users'].is_a?(Array)
             response.body['users'] = [response.body['user']]
             response.body.delete('user')
           end