diff --git a/lib/fog/aws/requests/sqs/change_message_visibility.rb b/lib/fog/aws/requests/sqs/change_message_visibility.rb
index 7f34281bb..af84af3df 100644
--- a/lib/fog/aws/requests/sqs/change_message_visibility.rb
+++ b/lib/fog/aws/requests/sqs/change_message_visibility.rb
@@ -34,7 +34,7 @@ module Fog
           Excon::Response.new.tap do |response|
             if (queue = data[:queues][queue_url])
               message_id, _ = queue[:receipt_handles].find { |message_id, receipts|
-                receipts.keys.include?(receipt_handle)
+                receipts.has_key?(receipt_handle)
               }
               
               if message_id
diff --git a/lib/fog/aws/requests/sqs/delete_message.rb b/lib/fog/aws/requests/sqs/delete_message.rb
index a69b1c29f..c25ba16a0 100644
--- a/lib/fog/aws/requests/sqs/delete_message.rb
+++ b/lib/fog/aws/requests/sqs/delete_message.rb
@@ -32,7 +32,7 @@ module Fog
           Excon::Response.new.tap do |response|
             if (queue = data[:queues][queue_url])
               message_id, _ = queue[:receipt_handles].find { |msg_id, receipts|
-                receipts.keys.include?(receipt_handle)
+                receipts.has_key?(receipt_handle)
               }
 
               if message_id
diff --git a/lib/fog/ecloud/requests/compute/add_backup_internet_service.rb b/lib/fog/ecloud/requests/compute/add_backup_internet_service.rb
index f86272306..3679f2dd0 100644
--- a/lib/fog/ecloud/requests/compute/add_backup_internet_service.rb
+++ b/lib/fog/ecloud/requests/compute/add_backup_internet_service.rb
@@ -7,7 +7,7 @@ module Fog
           if configure
             required_opts + [ :id, :href, :timeout ]
           end
-          unless required_opts.all? { |opt| service_data.keys.include?(opt) }
+          unless required_opts.all? { |opt| service_data.has_key?(opt) }
             raise ArgumentError.new("Required Backup Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/ecloud/requests/compute/add_internet_service.rb b/lib/fog/ecloud/requests/compute/add_internet_service.rb
index d50141675..ce307d702 100644
--- a/lib/fog/ecloud/requests/compute/add_internet_service.rb
+++ b/lib/fog/ecloud/requests/compute/add_internet_service.rb
@@ -15,7 +15,7 @@ module Fog
                             [:type, :url_send_string, :http_headers, :receive_string, :is_enabled]
                           end
 
-          unless required_opts.all? { |opt| monitor.keys.include?(opt) && monitor[opt] }
+          unless required_opts.all? { |opt| monitor.has_key?(opt) && monitor[opt] }
             raise ArgumentError.new("Required Monitor data missing: #{(required_opts - monitor.keys).map(&:inspect).join(", ")}")
           end
 
@@ -36,7 +36,7 @@ module Fog
           if configure
             required_opts + [ :id, :href, :timeout ]
           end
-          unless required_opts.all? { |opt| service_data.keys.include?(opt) }
+          unless required_opts.all? { |opt| service_data.has_key?(opt) }
             raise ArgumentError.new("Required Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/ecloud/requests/compute/add_node.rb b/lib/fog/ecloud/requests/compute/add_node.rb
index e1f0a1f6b..e8e06350e 100644
--- a/lib/fog/ecloud/requests/compute/add_node.rb
+++ b/lib/fog/ecloud/requests/compute/add_node.rb
@@ -20,7 +20,7 @@ module Fog
           if configure
             valid_opts.delete_if { |opt| ![:name, :enabled, :description].include?(opt) }
           end
-          unless valid_opts.all? { |opt| node_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| node_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - node_data.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/ecloud/requests/compute/clone_vapp.rb b/lib/fog/ecloud/requests/compute/clone_vapp.rb
index 54e6b36f4..616df1642 100644
--- a/lib/fog/ecloud/requests/compute/clone_vapp.rb
+++ b/lib/fog/ecloud/requests/compute/clone_vapp.rb
@@ -5,7 +5,7 @@ module Fog
 
         def validate_clone_vapp_options(options)
           valid_opts = [:name, :poweron]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/ecloud/requests/compute/configure_internet_service.rb b/lib/fog/ecloud/requests/compute/configure_internet_service.rb
index 201421398..b5270c72e 100644
--- a/lib/fog/ecloud/requests/compute/configure_internet_service.rb
+++ b/lib/fog/ecloud/requests/compute/configure_internet_service.rb
@@ -6,7 +6,7 @@ module Fog
 
         def validate_public_ip_address_data(ip_address_data)
           valid_opts = [:name, :href, :id]
-          unless valid_opts.all? { |opt| ip_address_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| ip_address_data.has_key?(opt) }
             raise ArgumentError.new("Required Internet Service data missing: #{(valid_opts - ip_address_data.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/ecloud/requests/compute/configure_network.rb b/lib/fog/ecloud/requests/compute/configure_network.rb
index 9bb8472d0..044a925d5 100644
--- a/lib/fog/ecloud/requests/compute/configure_network.rb
+++ b/lib/fog/ecloud/requests/compute/configure_network.rb
@@ -5,7 +5,7 @@ module Fog
 
         def validate_network_data(network_data, configure=false)
           valid_opts = [:id, :href, :name, :rnat, :address, :broadcast, :gateway]
-          unless valid_opts.all? { |opt| network_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_data.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/ecloud/requests/compute/configure_network_ip.rb b/lib/fog/ecloud/requests/compute/configure_network_ip.rb
index d687e8c9c..c9a816299 100644
--- a/lib/fog/ecloud/requests/compute/configure_network_ip.rb
+++ b/lib/fog/ecloud/requests/compute/configure_network_ip.rb
@@ -6,7 +6,7 @@ module Fog
 
         def validate_network_ip_data(network_ip_data)
           valid_opts = [:id, :href, :name, :status, :server, :rnat]
-          unless valid_opts.all? { |opt| network_ip_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_ip_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_ip_data.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/ecloud/requests/compute/configure_vapp.rb b/lib/fog/ecloud/requests/compute/configure_vapp.rb
index 79b7db0ff..cd8205d30 100644
--- a/lib/fog/ecloud/requests/compute/configure_vapp.rb
+++ b/lib/fog/ecloud/requests/compute/configure_vapp.rb
@@ -6,7 +6,7 @@ module Fog
 
         def validate_vapp_data(vapp_data)
           valid_opts = [:name, :cpus, :memory, :disks]
-          unless valid_opts.all? { |opt| vapp_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| vapp_data.has_key?(opt) }
             raise ArgumentError.new("Required Vapp data missing: #{(valid_opts - vapp_data.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/ecloud/requests/compute/instantiate_vapp_template.rb b/lib/fog/ecloud/requests/compute/instantiate_vapp_template.rb
index 3f5201126..ce2cf2ab3 100644
--- a/lib/fog/ecloud/requests/compute/instantiate_vapp_template.rb
+++ b/lib/fog/ecloud/requests/compute/instantiate_vapp_template.rb
@@ -6,7 +6,7 @@ module Fog
 
         def validate_instantiate_vapp_template_options(catalog_item_uri, options)
           valid_opts = [:name, :vdc_uri, :network_uri, :cpus, :memory, :row, :group]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
 
diff --git a/lib/fog/storm_on_demand/compute.rb b/lib/fog/storm_on_demand/compute.rb
index f0e9a0df5..2a80bd9a7 100644
--- a/lib/fog/storm_on_demand/compute.rb
+++ b/lib/fog/storm_on_demand/compute.rb
@@ -125,7 +125,7 @@ module Fog
           unless response.body.empty?
             response.body = MultiJson.decode(response.body)
           end
-          if response.body.keys.include?('full_error')
+          if response.body.has_key?('full_error')
             raise(Fog::Compute::StormOnDemand::Error, response.body.inspect)
           end
           response
diff --git a/lib/fog/vcloud/requests/compute/clone_vapp.rb b/lib/fog/vcloud/requests/compute/clone_vapp.rb
index d03b8cc7a..ac80756b6 100644
--- a/lib/fog/vcloud/requests/compute/clone_vapp.rb
+++ b/lib/fog/vcloud/requests/compute/clone_vapp.rb
@@ -5,7 +5,7 @@ module Fog
 
         def validate_clone_vapp_options(options)
           valid_opts = [:name, :poweron]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/vcloud/requests/compute/configure_network.rb b/lib/fog/vcloud/requests/compute/configure_network.rb
index ee634e012..1ff175939 100644
--- a/lib/fog/vcloud/requests/compute/configure_network.rb
+++ b/lib/fog/vcloud/requests/compute/configure_network.rb
@@ -5,7 +5,7 @@ module Fog
 
         def validate_network_data(network_data, configure=false)
           valid_opts = [:id, :href, :name, :address, :broadcast, :gateway]
-          unless valid_opts.all? { |opt| network_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_data.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/vcloud/requests/compute/configure_network_ip.rb b/lib/fog/vcloud/requests/compute/configure_network_ip.rb
index 0e77ffd2b..121d4fb34 100644
--- a/lib/fog/vcloud/requests/compute/configure_network_ip.rb
+++ b/lib/fog/vcloud/requests/compute/configure_network_ip.rb
@@ -6,7 +6,7 @@ module Fog
 
         def validate_network_ip_data(network_ip_data)
           valid_opts = [:id, :href, :name, :status, :server]
-          unless valid_opts.all? { |opt| network_ip_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_ip_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_ip_data.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/vcloud/requests/compute/configure_vapp.rb b/lib/fog/vcloud/requests/compute/configure_vapp.rb
index 2f4cde3ea..748d5ba8f 100644
--- a/lib/fog/vcloud/requests/compute/configure_vapp.rb
+++ b/lib/fog/vcloud/requests/compute/configure_vapp.rb
@@ -6,7 +6,7 @@ module Fog
 
         def validate_vapp_data(vapp_data)
           valid_opts = [:name, :cpus, :memory, :disks]
-          unless valid_opts.all? { |opt| vapp_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| vapp_data.has_key?(opt) }
             raise ArgumentError.new("Required Vapp data missing: #{(valid_opts - vapp_data.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/vcloud/requests/compute/configure_vm.rb b/lib/fog/vcloud/requests/compute/configure_vm.rb
index 9c1328a27..25e732819 100644
--- a/lib/fog/vcloud/requests/compute/configure_vm.rb
+++ b/lib/fog/vcloud/requests/compute/configure_vm.rb
@@ -138,7 +138,7 @@ module Fog
 
         def validate_vm_data(vm_data)
           valid_opts = [:name, :cpus, :memory, :disks]
-          unless valid_opts.all? { |opt| vm_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| vm_data.has_key?(opt) }
             raise ArgumentError.new("Required vm data missing: #{(valid_opts - vm_data.keys).map(&:inspect).join(", ")}")
           end
         end
diff --git a/lib/fog/vcloud/requests/compute/instantiate_vapp_template.rb b/lib/fog/vcloud/requests/compute/instantiate_vapp_template.rb
index 3dedea844..7683f98a4 100644
--- a/lib/fog/vcloud/requests/compute/instantiate_vapp_template.rb
+++ b/lib/fog/vcloud/requests/compute/instantiate_vapp_template.rb
@@ -7,7 +7,7 @@ module Fog
         def validate_instantiate_vapp_template_options options
           # :network_uri removed, if not specified will use template network config.
           valid_opts = [:catalog_item_uri, :name, :vdc_uri]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
           
diff --git a/spec/ecloud/spec_helper.rb b/spec/ecloud/spec_helper.rb
index 3b9f1c423..be428ff7f 100644
--- a/spec/ecloud/spec_helper.rb
+++ b/spec/ecloud/spec_helper.rb
@@ -327,7 +327,7 @@ end
 Spec::Matchers.define :have_keys_with_values do |expected|
   match do |actual|
     actual.each_pair.all? do |key, value|
-      expected.keys.include?(key) && expected[key] == value
+      expected.has_key?(key) && expected[key] == value
     end
   end
 end