@@ -41,6 +41,15 @@ module Formats
         'requestId' => String
       }
 
+      AVAILABILITY_ZONES = {
+        'availabilityZoneInfo'  => [{
+          'regionName'  => String,
+          'zoneName'    => String,
+          'zoneState'   => String
+        }],
+        'requestId'             => String
+      }
+
       BASIC = {
         'requestId' => String,
         'return'    => ::Fog::Boolean
 
@@ -0,0 +1,23 @@
+Shindo.tests('AWS::EC2 | availability zone requests', ['aws']) do
+
+  tests('success') do
+
+    tests('#describe_availability_zones').formats(AWS::EC2::Formats::AVAILABILITY_ZONES) do
+      AWS[:ec2].describe_availability_zones.body
+    end
+
+    tests("#describe_availability_zones('us-east-1a')").formats(AWS::EC2::Formats::AVAILABILITY_ZONES) do
+      AWS[:ec2].describe_availability_zones('us-east-1a').body
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#describe_availability_zones('not-a-zone')").raises(Excon::Errors::BadRequest) do
+      AWS[:ec2].describe_availability_zones('not-a-zone')
+    end
+
+  end
+
+end
@@ -1,4 +1,5 @@
 Shindo.tests('AWS::EC2 | region requests', ['aws']) do
+
   tests('success') do
 
     tests("#describe_regions").formats(AWS::EC2::Formats::REGIONS) do
@@ -10,10 +11,12 @@
     end
 
   end
+
   tests('failure') do
 
     tests("#describe_regions('not-a-region')").raises(Excon::Errors::BadRequest) do
-      AWS[:ec2].describe_regions('not-a-region').body
+      AWS[:ec2].describe_regions('not-a-region')
     end
   end
+
 end