diff --git a/lib/fog/aws/requests/elb/describe_load_balancers.rb b/lib/fog/aws/requests/elb/describe_load_balancers.rb
index 8b0c150e0..41bf8d7a6 100644
--- a/lib/fog/aws/requests/elb/describe_load_balancers.rb
+++ b/lib/fog/aws/requests/elb/describe_load_balancers.rb
@@ -63,7 +63,7 @@ module Fog
             end.compact
           else
             self.data[:load_balancers].map { |lb, values| values.dup }
-          end
+          end[0...400]
 
           response = Excon::Response.new
           response.status = 200
diff --git a/tests/aws/models/elb/model_tests.rb b/tests/aws/models/elb/model_tests.rb
index 2d1963f6d..6943e68e7 100644
--- a/tests/aws/models/elb/model_tests.rb
+++ b/tests/aws/models/elb/model_tests.rb
@@ -94,6 +94,13 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
       tests("contains elb").returns(true) { elb_ids.include? elb_id }
     end
 
+    if Fog.mocking?
+      tests('all marker support') do
+        extra_elb_ids = (1..1000).map {|n| Fog::AWS[:elb].load_balancers.create(:id => "#{elb_id}-extra-#{n}").id }
+        tests('returns all elbs').returns(true) { (extra_elb_ids - Fog::AWS[:elb].load_balancers.all.map {|e| e.id }).empty? }
+      end
+    end
+
     tests('get') do
       elb_get = Fog::AWS[:elb].load_balancers.get(elb_id)
       tests('ids match').returns(elb_id) { elb_get.id }