diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 1ccbb4d25..49404a99c 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -5,6 +5,7 @@
 Capybara.enable_aria_label = true
 Capybara.save_path = ENV.fetch("CIRCLE_ARTIFACTS", Capybara.save_path)
 Capybara.server = :puma, { Silent: true }
+Capybara.default_max_wait_time = Integer(ENV.fetch("CAPYBARA_MAX_WAIT_TIME", 5))
 
 Selenium::WebDriver.logger.output = Rails.root.join("log/selenium.log")