diff --git a/lib/capybara/driver/base.rb b/lib/capybara/driver/base.rb
index effb1bd8..bf34728b 100644
--- a/lib/capybara/driver/base.rb
+++ b/lib/capybara/driver/base.rb
@@ -37,7 +37,7 @@ class Capybara::Driver::Base
   def cleanup!
   end
 
-  def has_shortcircuit_timeout
+  def has_shortcircuit_timeout?
     false
   end
 
diff --git a/spec/session_with_javascript_support_spec.rb b/spec/session_with_javascript_support_spec.rb
index 7f3f613f..74b9bd19 100644
--- a/spec/session_with_javascript_support_spec.rb
+++ b/spec/session_with_javascript_support_spec.rb
@@ -97,7 +97,7 @@ shared_examples_for "session with javascript support" do
         begin
           @session.wait_until { false }
         rescue Capybara::TimeoutError; end
-        if @session.driver.has_shortcircuit_timeout
+        if @session.driver.has_shortcircuit_timeout?
           (Time.now - start).should be_close(0, 0.1)
         else
           (Time.now - start).should be_close(0.2, 0.1)