diff --git a/features/support/capybara.rb b/features/support/capybara.rb
index 33ca76bea8d..1e46b3faf0b 100644
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -1,4 +1,3 @@
-require 'spinach/capybara'
 require 'capybara/poltergeist'
 require 'capybara-screenshot/spinach'
 
@@ -25,5 +24,8 @@ Capybara.ignore_hidden_elements = false
 Capybara::Screenshot.prune_strategy = :keep_last_run
 
 Spinach.hooks.before_run do
+  require 'spinach/capybara'
+  require 'capybara/rails'
+
   TestEnv.eager_load_driver_server
 end
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 9db489e9a9b..a19a35c2c0d 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -172,7 +172,7 @@ module TestEnv
   def eager_load_driver_server
     return unless defined?(Capybara)
 
-    puts "Starting the Capybara driver' server..."
+    puts "Starting the Capybara driver server..."
     Capybara.current_session.visit '/'
   end