diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 905176ee6..6cfd5e360 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -56,13 +56,22 @@
       Capybara::Selenium::Driver.new(app, browser: :chrome)
     end
     Capybara.javascript_driver = :selenium_chrome
+
+    Capybara::Screenshot.register_driver(:selenium_chrome) do |driver, path|
+      driver.browser.save_screenshot(path)
+    end
   else
     Capybara.register_driver :selenium_firefox do |app|
       Capybara::Selenium::Driver.new(app, browser: :firefox)
     end
     Capybara.javascript_driver = :selenium_firefox
+
+    Capybara::Screenshot.register_driver(:selenium_firefox) do |driver, path|
+      driver.browser.save_screenshot(path)
+    end
   end
 
+  Capybara.default_wait_time = 15
   puts "Capybara using driver: #{Capybara.javascript_driver}"
 
   Capybara::Screenshot.prune_strategy = { keep: 10 }