diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index a5d845f51770030892256757897a204e171393d7..570654002206f0f19cc16c5a53dc2faa2d0043ea 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -7,7 +7,7 @@
 require 'selenium-webdriver'
 
 # Give CI some extra time
-timeout = ENV['CI'] || ENV['CI_SERVER'] ? 60 : 30
+timeout = ENV['CI'] || ENV['CI_SERVER'] ? 30 : 10
 
 # Support running Capybara on a specific port to allow saving commonly used pages
 Capybara.server_port = ENV['CAPYBARA_PORT'] if ENV['CAPYBARA_PORT']