diff --git a/lib/capybara/spec/session/assert_selector.rb b/lib/capybara/spec/session/assert_selector.rb
index a728f69c..f34d04b8 100644
--- a/lib/capybara/spec/session/assert_selector.rb
+++ b/lib/capybara/spec/session/assert_selector.rb
@@ -1,4 +1,4 @@
-Capybara::SpecHelper.spec '#asser_selector?' do
+Capybara::SpecHelper.spec '#assert_selector' do
   before do
     @session.visit('/with_html')
   end
@@ -60,7 +60,7 @@ Capybara::SpecHelper.spec '#asser_selector?' do
   end
 end
 
-Capybara::SpecHelper.spec '#has_no_selector?' do
+Capybara::SpecHelper.spec '#assert_no_selector' do
   before do
     @session.visit('/with_html')
   end
diff --git a/lib/capybara/spec/spec_helper.rb b/lib/capybara/spec/spec_helper.rb
index 00e8a92e..6f2ca5a8 100644
--- a/lib/capybara/spec/spec_helper.rb
+++ b/lib/capybara/spec/spec_helper.rb
@@ -12,6 +12,21 @@ module Capybara
           end
         end
         config.filter_run_excluding :requires => filter
+        config.before do
+          Capybara.app = TestApp
+
+          Capybara.configure do |config|
+            config.default_selector = :xpath
+          end
+
+          # set up a fast wait time so that most tests are faster
+          # but, if we require JS, increase it a bit.
+          if example.metadata[:requires] and example.metadata[:requires].include?(:js)
+            Capybara.default_wait_time = 1
+          else
+            Capybara.default_wait_time = 0
+          end
+        end
       end
 
       def spec(name, options={}, &block)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9ed64e15..47471f3f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,12 +7,6 @@ require 'rspec'
 require 'capybara'
 
 RSpec.configure do |config|
-  config.before do
-    Capybara.configure do |config|
-      config.default_selector = :xpath
-    end
-  end
-
   # Workaround for http://code.google.com/p/selenium/issues/detail?id=3147:
   # Rerun the example if we hit a transient "docElement is null" error
   config.around(:each) do |example|
@@ -32,14 +26,10 @@ end
 
 # Required here instead of in rspec_spec to avoid RSpec deprecation warning
 require 'capybara/rspec'
-
 require 'capybara/spec/session'
 
 alias :running :lambda
 
-Capybara.app = TestApp
-Capybara.default_wait_time = 1 # less timeout so tests run faster
-
 module TestSessions
   RackTest = Capybara::Session.new(:rack_test, TestApp)
   Selenium = Capybara::Session.new(:selenium, TestApp)