diff --git a/Gemfile b/Gemfile
index 7bb879bf2..1144294e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -72,10 +72,9 @@ end
 
 group :test do
   gem 'capybara'
-  gem 'chromedriver-helper'
   gem 'database_cleaner'
-  gem 'selenium-webdriver'
   gem 'shoulda-matchers', '~> 4.1'
+  gem 'webdrivers'
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b62719b4..69a629a22 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,8 +48,6 @@ GEM
       activerecord (>= 4.2.8)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    archive-zip (0.12.0)
-      io-like (~> 0.3.0)
     arel (6.0.4)
     ast (2.4.0)
     better_errors (2.5.1)
@@ -82,9 +80,6 @@ GEM
       coffee-rails (>= 3.2)
       railties (>= 3.0)
       sass-rails (>= 3.2)
-    chromedriver-helper (2.1.1)
-      archive-zip (~> 0.10)
-      nokogiri (~> 1.8)
     chunky_png (1.3.10)
     coderay (1.1.2)
     coffee-rails (4.2.2)
@@ -167,7 +162,6 @@ GEM
     icalendar (2.5.3)
       ice_cube (~> 0.16)
     ice_cube (0.16.3)
-    io-like (0.3.0)
     jaro_winkler (1.5.3)
     jbuilder (2.9.1)
       activesupport (>= 4.2.0)
@@ -373,6 +367,10 @@ GEM
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
     uniform_notifier (1.12.1)
+    webdrivers (4.1.2)
+      nokogiri (~> 1.6)
+      rubyzip (~> 1.0)
+      selenium-webdriver (>= 3.0, < 4.0)
     will_paginate (3.2.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
@@ -388,7 +386,6 @@ DEPENDENCIES
   carrierwave
   carrierwave-ftp
   chosen-rails
-  chromedriver-helper
   coffee-rails (~> 4.2)
   compass-rails!
   coveralls (~> 0.8.23)
@@ -436,7 +433,6 @@ DEPENDENCIES
   rspec-rails
   rubocop (~> 0.75.1)
   sass-rails (~> 5.0.1)
-  selenium-webdriver
   shoulda-matchers (~> 4.1)
   simple_form
   stripe
@@ -444,6 +440,7 @@ DEPENDENCIES
   turbolinks
   tzinfo-data
   uglifier (>= 1.3.0)
+  webdrivers
   will_paginate
 
 RUBY VERSION
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 66759cfdf..e44bb7d0d 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -1,4 +1,4 @@
-require 'selenium-webdriver'
+require 'webdrivers'
 
 Capybara.register_driver :chrome do |app|
   options = Selenium::WebDriver::Chrome::Options.new