diff --git a/lib/ae_page_objects/document_loader.rb b/lib/ae_page_objects/document_loader.rb
index 9c4ed4dc..cae07576 100644
--- a/lib/ae_page_objects/document_loader.rb
+++ b/lib/ae_page_objects/document_loader.rb
@@ -7,7 +7,7 @@ def initialize(query, strategy)
 
     def load
       begin
-        AePageObjects.wait_until do
+        AePageObjects.wait_until(10) do
           @query.conditions.each do |document_condition|
             if document = @strategy.load_document_with_condition(document_condition)
               return document
diff --git a/test/unit/document_loader_test.rb b/test/unit/document_loader_test.rb
index dc20a4c9..983e342e 100644
--- a/test/unit/document_loader_test.rb
+++ b/test/unit/document_loader_test.rb
@@ -54,11 +54,11 @@ def test_load_page__document_not_loaded_error
       loader = DocumentLoader.new(query, strategy)
 
       sequence = sequence('sequence')
-      strategy.expects(:load_document_with_condition).in_sequence(sequence).with(query.conditions[0]).returns(nil)
-      strategy.expects(:load_document_with_condition).in_sequence(sequence).with(query.conditions[1]).returns(nil)
-      strategy.expects(:load_document_with_condition).in_sequence(sequence).with(query.conditions[2]).returns(nil)
+      strategy.stubs(:load_document_with_condition).in_sequence(sequence).with(query.conditions[0]).returns(nil)
+      strategy.stubs(:load_document_with_condition).in_sequence(sequence).with(query.conditions[1]).returns(nil)
+      strategy.stubs(:load_document_with_condition).in_sequence(sequence).with(query.conditions[2]).returns(nil)
 
-      strategy.expects(:document_not_loaded_error_message).with(query).returns("hello")
+      strategy.stubs(:document_not_loaded_error_message).with(query).returns("hello")
 
       raised = assert_raise DocumentLoadError do
         loader.load
@@ -113,5 +113,3 @@ def default_max_wait_time
     end
   end
 end
-
-