diff --git a/spec/integration/session_spec.rb b/spec/integration/session_spec.rb
index d1c2fef..1b2f421 100644
--- a/spec/integration/session_spec.rb
+++ b/spec/integration/session_spec.rb
@@ -131,4 +131,55 @@ describe Capybara::Session do
       subject.response_headers['X-Capybara'].should == nil
     end
   end
+
+  context "slow iframe app" do
+    before do
+      @app = Class.new(ExampleApp) do
+        get '/' do
+          <<-HTML
+          <html>
+          <head>
+          <script>
+            function hang() {
+              xhr = new XMLHttpRequest();
+              xhr.onreadystatechange = function() {
+                if(xhr.readyState == 4){
+                  document.getElementById('p').innerText = 'finished'
+                }
+              }
+              xhr.open('GET', '/slow', true);
+              xhr.send();
+              document.getElementById("f").src = '/iframe';
+              return false;
+            }
+          </script>
+          </head>
+          <body>
+            <a href="#" onclick="hang()">Click Me!</a>
+            <iframe src="about:blank" id="f"></iframe>
+            <p id="p"></p>
+          </body>
+          </html>
+          HTML
+        end
+
+        get '/slow' do
+          status 204
+          sleep 1
+        end
+
+        get '/iframe' do
+          status 204
+        end
+      end
+    end
+
+    it "should not hang the server" do
+      subject.visit("/")
+      subject.click_link('Click Me!')
+      Capybara.using_wait_time(5) do
+        subject.should have_content("finished")
+      end
+    end
+  end
 end
