diff --git a/lib/fog/aws/models/compute/servers.rb b/lib/fog/aws/models/compute/servers.rb
index 0c9c30f46..a03b76831 100644
--- a/lib/fog/aws/models/compute/servers.rb
+++ b/lib/fog/aws/models/compute/servers.rb
@@ -49,7 +49,7 @@ module Fog
         #    user_data=nil
         #  >
         #
-        
+
         def initialize(attributes)
           self.filters ||= {}
           super
diff --git a/tests/helpers/collection_helper.rb b/tests/helpers/collection_helper.rb
index 7dd1a790e..c37493fec 100644
--- a/tests/helpers/collection_helper.rb
+++ b/tests/helpers/collection_helper.rb
@@ -12,6 +12,11 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
       @instance = collection.create(params)
     end
 
+    # FIXME: work around for timing issue on AWS describe_instances mocks
+    if Fog.mocking? && @instance.respond_to?(:ready?)
+      @instance.wait_for { ready? }
+    end
+
     tests("#all").succeeds do
       pending if Fog.mocking? && !mocks_implemented
       collection.all
diff --git a/tests/helpers/compute/server_helper.rb b/tests/helpers/compute/server_helper.rb
index 1dc7b6f9c..a8cd1df45 100644
--- a/tests/helpers/compute/server_helper.rb
+++ b/tests/helpers/compute/server_helper.rb
@@ -4,6 +4,7 @@ def server_tests(connection, params = {}, mocks_implemented = true)
 
     tests('#reload').returns(true) do
       pending if Fog.mocking? && !mocks_implemented
+      @instance.wait_for { ready? }
       identity = @instance.identity
       !identity.nil? && identity == @instance.reload.identity
     end