diff --git a/lib/fog/aws/requests/storage/copy_object.rb b/lib/fog/aws/requests/storage/copy_object.rb
index d8c712ce0..51d2a76e6 100644
--- a/lib/fog/aws/requests/storage/copy_object.rb
+++ b/lib/fog/aws/requests/storage/copy_object.rb
@@ -42,7 +42,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
           response = Excon::Response.new
diff --git a/lib/fog/aws/requests/storage/delete_bucket.rb b/lib/fog/aws/requests/storage/delete_bucket.rb
index 12aaeb5a0..769212e8e 100644
--- a/lib/fog/aws/requests/storage/delete_bucket.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket.rb
@@ -26,7 +26,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def delete_bucket(bucket_name)
           response = Excon::Response.new
diff --git a/lib/fog/aws/requests/storage/delete_object.rb b/lib/fog/aws/requests/storage/delete_object.rb
index 2f41ca7f7..b4e7d72d0 100644
--- a/lib/fog/aws/requests/storage/delete_object.rb
+++ b/lib/fog/aws/requests/storage/delete_object.rb
@@ -29,7 +29,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def delete_object(bucket_name, object_name)
           response = Excon::Response.new
diff --git a/lib/fog/aws/requests/storage/get_bucket.rb b/lib/fog/aws/requests/storage/get_bucket.rb
index edfa4b91e..a0d2d8d39 100644
--- a/lib/fog/aws/requests/storage/get_bucket.rb
+++ b/lib/fog/aws/requests/storage/get_bucket.rb
@@ -56,7 +56,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_bucket(bucket_name, options = {})
           unless bucket_name
diff --git a/lib/fog/aws/requests/storage/get_bucket_acl.rb b/lib/fog/aws/requests/storage/get_bucket_acl.rb
index 94628f542..cf1d698a5 100644
--- a/lib/fog/aws/requests/storage/get_bucket_acl.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_acl.rb
@@ -46,7 +46,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_bucket_acl(bucket_name)
           Fog::Mock.not_implemented
diff --git a/lib/fog/aws/requests/storage/get_bucket_location.rb b/lib/fog/aws/requests/storage/get_bucket_location.rb
index 55f53a5c6..774c1eed1 100644
--- a/lib/fog/aws/requests/storage/get_bucket_location.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_location.rb
@@ -32,7 +32,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_bucket_location(bucket_name)
           response = Excon::Response.new
diff --git a/lib/fog/aws/requests/storage/get_bucket_logging.rb b/lib/fog/aws/requests/storage/get_bucket_logging.rb
index 4132364cd..f516a8a6e 100644
--- a/lib/fog/aws/requests/storage/get_bucket_logging.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_logging.rb
@@ -46,7 +46,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_bucket_logging(bucket_name)
           Fog::Mock.not_implemented
diff --git a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
index c35572175..9b1ac434b 100644
--- a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
@@ -71,7 +71,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_bucket_object_versions(bucket_name, options = {})
           Fog::Mock.not_implemented
diff --git a/lib/fog/aws/requests/storage/get_bucket_versioning.rb b/lib/fog/aws/requests/storage/get_bucket_versioning.rb
index 820ca93ae..a4365063e 100644
--- a/lib/fog/aws/requests/storage/get_bucket_versioning.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_versioning.rb
@@ -36,7 +36,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_bucket_versioning(bucket_name)
           Fog::Mock.not_implemented
diff --git a/lib/fog/aws/requests/storage/get_object.rb b/lib/fog/aws/requests/storage/get_object.rb
index 27b0dfe39..440d8d3a1 100644
--- a/lib/fog/aws/requests/storage/get_object.rb
+++ b/lib/fog/aws/requests/storage/get_object.rb
@@ -55,7 +55,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_object(bucket_name, object_name, options = {}, &block)
           unless bucket_name
diff --git a/lib/fog/aws/requests/storage/get_object_acl.rb b/lib/fog/aws/requests/storage/get_object_acl.rb
index cfbb6aea5..60c8d2e41 100644
--- a/lib/fog/aws/requests/storage/get_object_acl.rb
+++ b/lib/fog/aws/requests/storage/get_object_acl.rb
@@ -57,7 +57,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_object_acl(bucket_name, object_name)
           Fog::Mock.not_implemented
diff --git a/lib/fog/aws/requests/storage/get_object_torrent.rb b/lib/fog/aws/requests/storage/get_object_torrent.rb
index 9c2f01ac8..b90a0ca00 100644
--- a/lib/fog/aws/requests/storage/get_object_torrent.rb
+++ b/lib/fog/aws/requests/storage/get_object_torrent.rb
@@ -46,7 +46,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_object_object(bucket_name, object_name)
           Fog::Mock.not_implemented
diff --git a/lib/fog/aws/requests/storage/get_object_url.rb b/lib/fog/aws/requests/storage/get_object_url.rb
index 80e6dfc55..0f483c893 100644
--- a/lib/fog/aws/requests/storage/get_object_url.rb
+++ b/lib/fog/aws/requests/storage/get_object_url.rb
@@ -34,7 +34,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_object_url(bucket_name, object_name, expires)
           unless bucket_name
diff --git a/lib/fog/aws/requests/storage/get_request_payment.rb b/lib/fog/aws/requests/storage/get_request_payment.rb
index c0b54b0bd..d55580009 100644
--- a/lib/fog/aws/requests/storage/get_request_payment.rb
+++ b/lib/fog/aws/requests/storage/get_request_payment.rb
@@ -32,7 +32,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_request_payment(bucket_name)
           response = Excon::Response.new
diff --git a/lib/fog/aws/requests/storage/get_service.rb b/lib/fog/aws/requests/storage/get_service.rb
index a714a292e..6bccb5a14 100644
--- a/lib/fog/aws/requests/storage/get_service.rb
+++ b/lib/fog/aws/requests/storage/get_service.rb
@@ -34,7 +34,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_service
           response = Excon::Response.new
diff --git a/lib/fog/aws/requests/storage/head_object.rb b/lib/fog/aws/requests/storage/head_object.rb
index d354da9d5..5451a8020 100644
--- a/lib/fog/aws/requests/storage/head_object.rb
+++ b/lib/fog/aws/requests/storage/head_object.rb
@@ -54,7 +54,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def head_object(bucket_name, object_name, options = {})
           response = get_object(bucket_name, object_name, options)
diff --git a/lib/fog/aws/requests/storage/post_object_hidden_fields.rb b/lib/fog/aws/requests/storage/post_object_hidden_fields.rb
index 82dd3acff..bbd371783 100644
--- a/lib/fog/aws/requests/storage/post_object_hidden_fields.rb
+++ b/lib/fog/aws/requests/storage/post_object_hidden_fields.rb
@@ -38,7 +38,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def post_object_hidden_fields(options = {})
           Fog::Mock.not_implemented
diff --git a/lib/fog/aws/requests/storage/put_bucket.rb b/lib/fog/aws/requests/storage/put_bucket.rb
index 5f69353f9..c4b82f90e 100644
--- a/lib/fog/aws/requests/storage/put_bucket.rb
+++ b/lib/fog/aws/requests/storage/put_bucket.rb
@@ -41,7 +41,7 @@ DATA
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_bucket(bucket_name, options = {})
           response = Excon::Response.new
diff --git a/lib/fog/aws/requests/storage/put_bucket_acl.rb b/lib/fog/aws/requests/storage/put_bucket_acl.rb
index ccf5c1a29..9072f9545 100644
--- a/lib/fog/aws/requests/storage/put_bucket_acl.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_acl.rb
@@ -72,7 +72,7 @@ DATA
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_bucket_acl(bucket_name, acl)
           Fog::Mock.not_implemented
diff --git a/lib/fog/aws/requests/storage/put_bucket_logging.rb b/lib/fog/aws/requests/storage/put_bucket_logging.rb
index de0ca61b2..61cbacfc5 100644
--- a/lib/fog/aws/requests/storage/put_bucket_logging.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_logging.rb
@@ -79,7 +79,7 @@ DATA
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_bucket_logging(bucket_name, logging_status)
           Fog::Mock.not_implemented
diff --git a/lib/fog/aws/requests/storage/put_bucket_versioning.rb b/lib/fog/aws/requests/storage/put_bucket_versioning.rb
index d346fcaf4..8bc08f678 100644
--- a/lib/fog/aws/requests/storage/put_bucket_versioning.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_versioning.rb
@@ -32,7 +32,7 @@ DATA
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_bucket_versioning(bucket_name, status)
           Fog::Mock.not_implemented
diff --git a/lib/fog/aws/requests/storage/put_object.rb b/lib/fog/aws/requests/storage/put_object.rb
index a90348dc4..3c6d769b4 100644
--- a/lib/fog/aws/requests/storage/put_object.rb
+++ b/lib/fog/aws/requests/storage/put_object.rb
@@ -43,7 +43,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_object(bucket_name, object_name, data, options = {})
           data = parse_data(data)
diff --git a/lib/fog/aws/requests/storage/put_object_url.rb b/lib/fog/aws/requests/storage/put_object_url.rb
index 9965c3b0e..71610339f 100644
--- a/lib/fog/aws/requests/storage/put_object_url.rb
+++ b/lib/fog/aws/requests/storage/put_object_url.rb
@@ -34,7 +34,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_object_url(bucket_name, object_name, expires)
           unless bucket_name
diff --git a/lib/fog/aws/requests/storage/put_request_payment.rb b/lib/fog/aws/requests/storage/put_request_payment.rb
index 0a5114859..aba9cf7d8 100644
--- a/lib/fog/aws/requests/storage/put_request_payment.rb
+++ b/lib/fog/aws/requests/storage/put_request_payment.rb
@@ -31,7 +31,7 @@ DATA
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_request_payment(bucket_name, payer)
           response = Excon::Response.new