diff --git a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/Gemfile b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/Gemfile
index 92dd6329a..e5f27cc03 100644
--- a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/Gemfile
+++ b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/Gemfile
@@ -54,14 +54,14 @@ end
 
 group :test do
   gem "capybara"
-  gem "poltergeist"
+  gem "cuprite"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Added at 2017-08-07 11:54:06 -0700 by USER:
-gem "mysql2", "~> 0.4.8"
+gem "mysql2", "~> 0.5.5"
 
 # Added at 2017-08-07 11:54:12 -0700 by USER:
 gem "appengine", ">= 0.4.1", "< 0.7.1"
diff --git a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/Gemfile.lock b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/Gemfile.lock
index d8d95ac6b..c2689354f 100644
--- a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/Gemfile.lock
+++ b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/Gemfile.lock
@@ -42,37 +42,48 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     appengine (0.7.0)
       google-cloud-env (~> 1.4)
       google-serverless-exec (>= 0.1, < 2.a)
       stackdriver (~> 0.21)
     arel (9.0.0)
+    base64 (0.1.1)
     bindex (0.8.1)
     builder (3.2.4)
-    byebug (11.1.1)
-    capybara (3.31.0)
+    byebug (11.1.3)
+    capybara (3.39.2)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    cliver (0.3.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
-    diff-lcs (1.3)
-    erubi (1.11.0)
-    faraday (2.5.2)
+    cuprite (0.14.3)
+      capybara (~> 3.0)
+      ferrum (~> 0.13.0)
+    date (3.3.3)
+    diff-lcs (1.5.0)
+    erubi (1.12.0)
+    faraday (2.7.11)
+      base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
-    faraday-retry (2.0.0)
+    faraday-net_http (3.0.2)
+    faraday-retry (2.2.0)
       faraday (~> 2.0)
-    ffi (1.12.2)
-    gapic-common (0.11.1)
+    ferrum (0.13)
+      addressable (~> 2.5)
+      concurrent-ruby (~> 1.1)
+      webrick (~> 1.7)
+      websocket-driver (>= 0.6, < 0.8)
+    ffi (1.16.3)
+    gapic-common (0.20.0)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
       google-protobuf (~> 3.14)
@@ -80,96 +91,103 @@ GEM
       googleapis-common-protos-types (>= 1.3.1, < 2.a)
       googleauth (~> 1.0)
       grpc (~> 1.36)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-error_reporting (0.42.2)
+    google-cloud-error_reporting (0.42.3)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.5)
       google-cloud-error_reporting-v1beta1 (~> 0.0)
       stackdriver-core (~> 1.3)
-    google-cloud-error_reporting-v1beta1 (0.5.0)
-      gapic-common (>= 0.10, < 2.a)
+    google-cloud-error_reporting-v1beta1 (0.8.0)
+      gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-logging (2.3.1)
+    google-cloud-errors (1.3.1)
+    google-cloud-logging (2.3.3)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.5)
       google-cloud-logging-v2 (~> 0.0)
       stackdriver-core (~> 1.3)
-    google-cloud-logging-v2 (0.8.1)
-      gapic-common (>= 0.10, < 2.a)
+    google-cloud-logging-v2 (0.11.0)
+      gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-trace (0.42.1)
+    google-cloud-trace (0.42.2)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.5)
       google-cloud-trace-v1 (~> 0.0)
       google-cloud-trace-v2 (~> 0.0)
       stackdriver-core (~> 1.3)
-    google-cloud-trace-v1 (0.4.0)
-      gapic-common (>= 0.10, < 2.a)
+    google-cloud-trace-v1 (0.7.0)
+      gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-trace-v2 (0.4.0)
-      gapic-common (>= 0.10, < 2.a)
+    google-cloud-trace-v2 (0.7.0)
+      gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-protobuf (3.21.5)
+    google-protobuf (3.24.4)
     google-serverless-exec (0.2.0)
-    googleapis-common-protos (1.3.12)
+    googleapis-common-protos (1.4.0)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.2)
       grpc (~> 1.27)
-    googleapis-common-protos-types (1.4.0)
-      google-protobuf (~> 3.14)
-    googleauth (1.2.0)
+    googleapis-common-protos-types (1.9.0)
+      google-protobuf (~> 3.18)
+    googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.48.0)
-      google-protobuf (~> 3.19)
+    grpc (1.59.0)
+      google-protobuf (~> 3.24)
       googleapis-common-protos-types (~> 1.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.10.0)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    jwt (2.5.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    loofah (2.18.0)
+    jwt (2.7.1)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    loofah (2.21.4)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
-    memoist (0.16.2)
+    matrix (0.4.2)
     method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
+    minitest (5.20.0)
     multi_json (1.15.0)
-    mysql2 (0.4.10)
-    nio4r (2.5.8)
-    nokogiri (1.13.8)
-      mini_portile2 (~> 2.8.0)
+    mysql2 (0.5.5)
+    net-imap (0.4.2)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.4.0)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     os (1.1.4)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
-    public_suffix (5.0.0)
-    puma (3.12.2)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
+    public_suffix (5.0.3)
+    puma (3.12.6)
+    racc (1.7.1)
+    rack (2.2.8)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rails (5.2.8.1)
       actioncable (= 5.2.8.1)
@@ -184,15 +202,17 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.2.8.1)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.4)
-      actionpack (>= 5.0.1.x)
-      actionview (>= 5.0.1.x)
-      activesupport (>= 5.0.1.x)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     railties (5.2.8.1)
       actionpack (= 5.2.8.1)
       activesupport (= 5.2.8.1)
@@ -200,43 +220,42 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (13.0.6)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.6.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    regexp_parser (2.8.2)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rspec_junit_formatter (0.4.1)
+      rspec-support (~> 3.12.0)
+    rspec-rails (5.1.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.12.1)
+    rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby2_keywords (0.0.5)
-    ruby_dep (1.5.0)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
+    sass-rails (5.1.0)
+      railties (>= 5.2.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -256,17 +275,19 @@ GEM
       google-cloud-trace (~> 0.40)
     stackdriver-core (1.5.0)
       google-cloud-core (~> 1.2)
-    thor (1.2.1)
+    thor (1.3.0)
     thread_safe (0.3.6)
-    tilt (2.0.10)
-    tzinfo (1.2.10)
+    tilt (2.3.0)
+    timeout (0.4.0)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    websocket-driver (0.7.5)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
@@ -279,10 +300,10 @@ DEPENDENCIES
   appengine (>= 0.4.1, < 0.7.1)
   byebug
   capybara
+  cuprite
   jbuilder (~> 2.5)
-  listen (>= 3.0.5, < 3.2)
-  mysql2 (~> 0.4.8)
-  poltergeist
+  listen (>= 3.0.5, < 3.8.1)
+  mysql2 (~> 0.5.5)
   puma (~> 3.7)
   rails (>= 5.1.3, < 5.3)
   rails-controller-testing
@@ -294,4 +315,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   1.17.2
+   2.2.3
diff --git a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/spec/rails_helper.rb b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/spec/rails_helper.rb
index fecb9c055..0c9510317 100644
--- a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/spec/rails_helper.rb
+++ b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-mysql/spec/rails_helper.rb
@@ -6,14 +6,14 @@
 require "spec_helper"
 require "rspec/rails"
 require "capybara/rspec"
-require "capybara/poltergeist"
+require "capybara/cuprite"
 
 require File.expand_path "../../../spec/e2e", __dir__
 
 # Checks for pending migration and applies them before tests are run.
 ActiveRecord::Migration.maintain_test_schema!
 
-Capybara.current_driver = :poltergeist
+Capybara.current_driver = :cuprite
 
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
diff --git a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/Gemfile b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/Gemfile
index 3db0a3fef..ec09d6f57 100644
--- a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/Gemfile
+++ b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/Gemfile
@@ -54,7 +54,7 @@ end
 
 group :test do
   gem "capybara"
-  gem "poltergeist"
+  gem "cuprite"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/Gemfile.lock b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/Gemfile.lock
index d6aa84ecd..f6cd0f253 100644
--- a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/Gemfile.lock
+++ b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/Gemfile.lock
@@ -42,135 +42,152 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    appengine (0.6.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
+    appengine (0.7.0)
       google-cloud-env (~> 1.4)
-      stackdriver (~> 0.20, >= 0.20.1)
+      google-serverless-exec (>= 0.1, < 2.a)
+      stackdriver (~> 0.21)
     arel (9.0.0)
+    base64 (0.1.1)
     bindex (0.8.1)
     builder (3.2.4)
-    byebug (11.1.1)
-    capybara (3.31.0)
+    byebug (11.1.3)
+    capybara (3.39.2)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    cliver (0.3.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
-    diff-lcs (1.3)
-    erubi (1.11.0)
-    faraday (1.4.1)
-      faraday-excon (~> 1.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      multipart-post (>= 1.2, < 3)
+    cuprite (0.14.3)
+      capybara (~> 3.0)
+      ferrum (~> 0.13.0)
+    date (3.3.3)
+    diff-lcs (1.5.0)
+    erubi (1.12.0)
+    faraday (2.7.11)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-excon (1.1.0)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    ffi (1.12.2)
-    gapic-common (0.4.1)
-      faraday (~> 1.3)
-      google-protobuf (~> 3.15, >= 3.15.2)
-      googleapis-common-protos (>= 1.3.11, < 2.0)
-      googleapis-common-protos-types (>= 1.0.6, < 2.0)
-      googleauth (~> 0.15, >= 0.15.1)
+    faraday-net_http (3.0.2)
+    faraday-retry (2.2.0)
+      faraday (~> 2.0)
+    ferrum (0.13)
+      addressable (~> 2.5)
+      concurrent-ruby (~> 1.1)
+      webrick (~> 1.7)
+      websocket-driver (>= 0.6, < 0.8)
+    ffi (1.16.3)
+    gapic-common (0.20.0)
+      faraday (>= 1.9, < 3.a)
+      faraday-retry (>= 1.0, < 3.a)
+      google-protobuf (~> 3.14)
+      googleapis-common-protos (>= 1.3.12, < 2.a)
+      googleapis-common-protos-types (>= 1.3.1, < 2.a)
+      googleauth (~> 1.0)
       grpc (~> 1.36)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-error_reporting (0.42.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-error_reporting (0.42.3)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.5)
       google-cloud-error_reporting-v1beta1 (~> 0.0)
       stackdriver-core (~> 1.3)
-    google-cloud-error_reporting-v1beta1 (0.4.0)
-      gapic-common (~> 0.3)
+    google-cloud-error_reporting-v1beta1 (0.8.0)
+      gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-errors (1.1.0)
-    google-cloud-logging (2.2.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-logging (2.3.3)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.5)
       google-cloud-logging-v2 (~> 0.0)
       stackdriver-core (~> 1.3)
-    google-cloud-logging-v2 (0.5.0)
-      gapic-common (~> 0.3)
+    google-cloud-logging-v2 (0.11.0)
+      gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-trace (0.41.0)
+    google-cloud-trace (0.42.2)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.5)
       google-cloud-trace-v1 (~> 0.0)
       google-cloud-trace-v2 (~> 0.0)
       stackdriver-core (~> 1.3)
-    google-cloud-trace-v1 (0.3.0)
-      gapic-common (~> 0.3)
+    google-cloud-trace-v1 (0.7.0)
+      gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-trace-v2 (0.3.0)
-      gapic-common (~> 0.3)
+    google-cloud-trace-v2 (0.7.0)
+      gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-protobuf (3.15.8)
-    googleapis-common-protos (1.3.11)
+    google-protobuf (3.24.4)
+    google-serverless-exec (0.2.0)
+    googleapis-common-protos (1.4.0)
       google-protobuf (~> 3.14)
-      googleapis-common-protos-types (>= 1.0.6, < 2.0)
+      googleapis-common-protos-types (~> 1.2)
       grpc (~> 1.27)
-    googleapis-common-protos-types (1.0.6)
-      google-protobuf (~> 3.14)
-    googleauth (0.16.1)
-      faraday (>= 0.17.3, < 2.0)
+    googleapis-common-protos-types (1.9.0)
+      google-protobuf (~> 3.18)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
-    grpc (1.37.0)
-      google-protobuf (~> 3.15)
+      signet (>= 0.16, < 2.a)
+    grpc (1.59.0)
+      google-protobuf (~> 3.24)
       googleapis-common-protos-types (~> 1.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.10.0)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    jwt (2.2.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    loofah (2.18.0)
+    jwt (2.7.1)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    loofah (2.21.4)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
-    memoist (0.16.2)
+    matrix (0.4.2)
     method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
+    minitest (5.20.0)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
-    nio4r (2.5.8)
-    nokogiri (1.13.8)
-      mini_portile2 (~> 2.8.0)
+    net-imap (0.4.2)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.4.0)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    os (1.1.1)
-    pg (1.2.3)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
-    public_suffix (4.0.3)
-    puma (3.12.2)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
+    os (1.1.4)
+    pg (1.5.4)
+    public_suffix (5.0.3)
+    puma (3.12.6)
+    racc (1.7.1)
+    rack (2.2.8)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rails (5.2.8.1)
       actioncable (= 5.2.8.1)
@@ -185,15 +202,17 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.2.8.1)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.4)
-      actionpack (>= 5.0.1.x)
-      actionview (>= 5.0.1.x)
-      activesupport (>= 5.0.1.x)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     railties (5.2.8.1)
       actionpack (= 5.2.8.1)
       activesupport (= 5.2.8.1)
@@ -201,45 +220,44 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (13.0.6)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.6.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    regexp_parser (2.8.2)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rspec_junit_formatter (0.4.1)
+      rspec-support (~> 3.12.0)
+    rspec-rails (5.1.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.12.1)
+    rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby2_keywords (0.0.4)
-    ruby_dep (1.5.0)
+    ruby2_keywords (0.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
+    sass-rails (5.1.0)
+      railties (>= 5.2.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    signet (0.15.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
+    signet (0.18.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     sprockets (3.7.2)
@@ -251,23 +269,25 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.5.3)
       mini_portile2 (~> 2.8.0)
-    stackdriver (0.21.0)
+    stackdriver (0.21.1)
       google-cloud-error_reporting (~> 0.41)
       google-cloud-logging (~> 2.1)
       google-cloud-trace (~> 0.40)
     stackdriver-core (1.5.0)
       google-cloud-core (~> 1.2)
-    thor (1.2.1)
+    thor (1.3.0)
     thread_safe (0.3.6)
-    tilt (2.0.10)
-    tzinfo (1.2.10)
+    tilt (2.3.0)
+    timeout (0.4.0)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    websocket-driver (0.7.5)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
@@ -280,10 +300,10 @@ DEPENDENCIES
   appengine (~> 0.6)
   byebug
   capybara
+  cuprite
   jbuilder (~> 2.5)
-  listen (>= 3.0.5, < 3.2)
+  listen (>= 3.0.5, < 3.8.1)
   pg (~> 1.2)
-  poltergeist
   puma (~> 3.7)
   rails (>= 5.1.3, < 5.3)
   rails-controller-testing
@@ -295,4 +315,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.4.21
diff --git a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/spec/rails_helper.rb b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/spec/rails_helper.rb
index fecb9c055..0c9510317 100644
--- a/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/spec/rails_helper.rb
+++ b/appengine/flexible/ruby31-and-earlier/rails-cloudsql-postgres/spec/rails_helper.rb
@@ -6,14 +6,14 @@
 require "spec_helper"
 require "rspec/rails"
 require "capybara/rspec"
-require "capybara/poltergeist"
+require "capybara/cuprite"
 
 require File.expand_path "../../../spec/e2e", __dir__
 
 # Checks for pending migration and applies them before tests are run.
 ActiveRecord::Migration.maintain_test_schema!
 
-Capybara.current_driver = :poltergeist
+Capybara.current_driver = :cuprite
 
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
diff --git a/appengine/flexible/ruby31-and-earlier/static_files/rails/Gemfile b/appengine/flexible/ruby31-and-earlier/static_files/rails/Gemfile
index 9cd941acc..48c3062df 100644
--- a/appengine/flexible/ruby31-and-earlier/static_files/rails/Gemfile
+++ b/appengine/flexible/ruby31-and-earlier/static_files/rails/Gemfile
@@ -22,7 +22,7 @@ gem "uglifier"
 
 group :test do
   gem "capybara"
-  gem "poltergeist"
+  gem "cuprite"
   gem "puma"
   gem "rspec_junit_formatter"
   gem "rspec-rails"
diff --git a/appengine/flexible/ruby31-and-earlier/static_files/rails/Gemfile.lock b/appengine/flexible/ruby31-and-earlier/static_files/rails/Gemfile.lock
index 01422ab65..3bc8d4ec8 100644
--- a/appengine/flexible/ruby31-and-earlier/static_files/rails/Gemfile.lock
+++ b/appengine/flexible/ruby31-and-earlier/static_files/rails/Gemfile.lock
@@ -53,7 +53,6 @@ GEM
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       xpath (~> 3.1)
-    cliver (0.3.2)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0)
@@ -63,9 +62,17 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
+    cuprite (0.14.3)
+      capybara (~> 3.0)
+      ferrum (~> 0.13.0)
     diff-lcs (1.3)
     erubi (1.12.0)
     execjs (2.7.0)
+    ferrum (0.13)
+      addressable (~> 2.5)
+      concurrent-ruby (~> 1.1)
+      webrick (~> 1.7)
+      websocket-driver (>= 0.6, < 0.8)
     ffi (1.9.25)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
@@ -94,10 +101,6 @@ GEM
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
     public_suffix (3.0.2)
     puma (5.6.7)
       nio4r (~> 2.0)
@@ -191,6 +194,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.12)
       execjs (>= 0.3.0, < 3)
+    webrick (1.8.1)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
@@ -203,8 +207,8 @@ PLATFORMS
 DEPENDENCIES
   capybara
   coffee-rails
+  cuprite
   jquery-rails
-  poltergeist
   puma
   rails (~> 5.0)
   rspec-rails
@@ -215,4 +219,4 @@ DEPENDENCIES
   uglifier
 
 BUNDLED WITH
-   1.16.2
+   2.4.21
diff --git a/appengine/flexible/ruby31-and-earlier/static_files/rails/spec/features/static_file_serving_spec.rb b/appengine/flexible/ruby31-and-earlier/static_files/rails/spec/features/static_file_serving_spec.rb
index a150fb125..0beb0ff16 100644
--- a/appengine/flexible/ruby31-and-earlier/static_files/rails/spec/features/static_file_serving_spec.rb
+++ b/appengine/flexible/ruby31-and-earlier/static_files/rails/spec/features/static_file_serving_spec.rb
@@ -13,7 +13,7 @@
 
 require "spec_helper"
 
-Capybara.default_driver = :poltergeist
+Capybara.default_driver = :cuprite
 Capybara.server = :puma, { Silent: true }
 
 feature "Serving static files" do
diff --git a/appengine/flexible/ruby31-and-earlier/static_files/rails/spec/spec_helper.rb b/appengine/flexible/ruby31-and-earlier/static_files/rails/spec/spec_helper.rb
index 0ef1961cb..8ea9c37b9 100644
--- a/appengine/flexible/ruby31-and-earlier/static_files/rails/spec/spec_helper.rb
+++ b/appengine/flexible/ruby31-and-earlier/static_files/rails/spec/spec_helper.rb
@@ -17,7 +17,7 @@
 require File.expand_path("../../../../spec/e2e", __dir__)
 require "rspec/rails"
 require "capybara/rails"
-require "capybara/poltergeist"
+require "capybara/cuprite"
 require "rack/test"
 
 RSpec.configure do |config|
diff --git a/appengine/flexible/ruby31-and-earlier/static_files/sinatra/Gemfile b/appengine/flexible/ruby31-and-earlier/static_files/sinatra/Gemfile
index a25a76524..c5ae5169f 100644
--- a/appengine/flexible/ruby31-and-earlier/static_files/sinatra/Gemfile
+++ b/appengine/flexible/ruby31-and-earlier/static_files/sinatra/Gemfile
@@ -18,7 +18,7 @@ gem "slim"
 
 group :test do
   gem "capybara"
-  gem "poltergeist"
+  gem "cuprite"
   gem "puma"
   gem "rspec"
   gem "rspec_junit_formatter"
diff --git a/appengine/flexible/ruby31-and-earlier/static_files/sinatra/Gemfile.lock b/appengine/flexible/ruby31-and-earlier/static_files/sinatra/Gemfile.lock
index 9e852cde9..88edb9b6f 100644
--- a/appengine/flexible/ruby31-and-earlier/static_files/sinatra/Gemfile.lock
+++ b/appengine/flexible/ruby31-and-earlier/static_files/sinatra/Gemfile.lock
@@ -10,18 +10,22 @@ GEM
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       xpath (~> 3.1)
-    cliver (0.3.2)
+    concurrent-ruby (1.2.2)
+    cuprite (0.14.3)
+      capybara (~> 3.0)
+      ferrum (~> 0.13.0)
     diff-lcs (1.3)
+    ferrum (0.13)
+      addressable (~> 2.5)
+      concurrent-ruby (~> 1.1)
+      webrick (~> 1.7)
+      websocket-driver (>= 0.6, < 0.8)
     mini_mime (1.0.0)
     mini_portile2 (2.4.0)
     mustermann (1.0.2)
     nio4r (2.5.9)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
     public_suffix (3.0.2)
     puma (5.6.7)
       nio4r (~> 2.0)
@@ -55,9 +59,10 @@ GEM
       tilt (>= 1.3.3, < 2.1)
     temple (0.8.0)
     tilt (2.0.8)
-    websocket-driver (0.7.0)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
     xpath (3.1.0)
       nokogiri (~> 1.8)
 
@@ -66,7 +71,7 @@ PLATFORMS
 
 DEPENDENCIES
   capybara
-  poltergeist
+  cuprite
   puma
   rspec
   rspec_junit_formatter
@@ -74,4 +79,4 @@ DEPENDENCIES
   slim
 
 BUNDLED WITH
-   1.16.2
+   2.4.21
diff --git a/appengine/flexible/ruby31-and-earlier/static_files/sinatra/spec/static_file_serving_spec.rb b/appengine/flexible/ruby31-and-earlier/static_files/sinatra/spec/static_file_serving_spec.rb
index b1b3de457..f2ede16d5 100644
--- a/appengine/flexible/ruby31-and-earlier/static_files/sinatra/spec/static_file_serving_spec.rb
+++ b/appengine/flexible/ruby31-and-earlier/static_files/sinatra/spec/static_file_serving_spec.rb
@@ -14,9 +14,9 @@
 require_relative "../app.rb"
 require "rspec"
 require "capybara/rspec"
-require "capybara/poltergeist"
+require "capybara/cuprite"
 
-Capybara.default_driver = :poltergeist
+Capybara.default_driver = :cuprite
 Capybara.server = :puma, { Silent: true }
 
 feature "Serving static files" do
diff --git a/appengine/flexible/ruby31-and-earlier/storage/Gemfile b/appengine/flexible/ruby31-and-earlier/storage/Gemfile
index b7ff1b3bc..c779959c8 100644
--- a/appengine/flexible/ruby31-and-earlier/storage/Gemfile
+++ b/appengine/flexible/ruby31-and-earlier/storage/Gemfile
@@ -21,7 +21,7 @@ gem "sinatra"
 
 group :test do
   gem "capybara"
-  gem "poltergeist"
+  gem "cuprite"
   gem "puma"
   gem "rspec"
   gem "rspec_junit_formatter"
diff --git a/appengine/flexible/ruby31-and-earlier/storage/Gemfile.lock b/appengine/flexible/ruby31-and-earlier/storage/Gemfile.lock
index ba2594274..fbb2c5f19 100644
--- a/appengine/flexible/ruby31-and-earlier/storage/Gemfile.lock
+++ b/appengine/flexible/ruby31-and-earlier/storage/Gemfile.lock
@@ -1,9 +1,10 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.4)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    capybara (3.39.0)
+    base64 (0.1.1)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -12,16 +13,25 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    cliver (0.3.2)
+    concurrent-ruby (1.2.2)
+    cuprite (0.14.3)
+      capybara (~> 3.0)
+      ferrum (~> 0.13.0)
     declarative (0.0.20)
     diff-lcs (1.5.0)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    faraday (2.7.4)
+    faraday (2.7.11)
+      base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    google-apis-core (0.11.0)
+    ferrum (0.13)
+      addressable (~> 2.5)
+      concurrent-ruby (~> 1.1)
+      webrick (~> 1.7)
+      websocket-driver (>= 0.6, < 0.8)
+    google-apis-core (0.11.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -48,95 +58,87 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.5.1)
+    googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     httpclient (2.8.3)
-    jwt (2.7.0)
+    jwt (2.7.1)
     matrix (0.4.2)
-    memoist (0.16.2)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
+    mini_mime (1.1.5)
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.9)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     os (1.1.4)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
-    public_suffix (5.0.1)
-    puma (6.2.1)
+    public_suffix (5.0.3)
+    puma (6.4.0)
       nio4r (~> 2.0)
-    racc (1.6.2)
-    rack (2.2.6.4)
-    rack-protection (3.0.6)
-      rack
+    racc (1.7.1)
+    rack (2.2.8)
+    rack-protection (3.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     rake (13.0.6)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.2)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby2_keywords (0.0.5)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    sinatra (3.0.6)
+    sinatra (3.1.0)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.6)
+      rack-protection (= 3.1.0)
       tilt (~> 2.0)
-    tilt (2.1.0)
+    tilt (2.3.0)
     trailblazer-option (0.1.2)
     uber (0.1.0)
     webrick (1.8.1)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   capybara
+  cuprite
   google-cloud-storage
-  poltergeist
   puma
   rspec
   rspec_junit_formatter
   sinatra
 
 BUNDLED WITH
-   2.4.1
+   2.4.21
diff --git a/appengine/flexible/ruby31-and-earlier/storage/spec/storage_spec.rb b/appengine/flexible/ruby31-and-earlier/storage/spec/storage_spec.rb
index afc801a64..38eb56897 100644
--- a/appengine/flexible/ruby31-and-earlier/storage/spec/storage_spec.rb
+++ b/appengine/flexible/ruby31-and-earlier/storage/spec/storage_spec.rb
@@ -15,11 +15,11 @@
 require_relative "../app.rb"
 require "rspec"
 require "capybara/rspec"
-require "capybara/poltergeist"
+require "capybara/cuprite"
 
 describe "Cloud Storage", type: :feature do
   before do
-    Capybara.current_driver = :poltergeist
+    Capybara.current_driver = :cuprite
   end
   it "can upload and get public URL of uploaded file" do
     Capybara.app = Sinatra::Application
diff --git a/appengine/flexible/ruby31-and-earlier/websockets/Gemfile b/appengine/flexible/ruby31-and-earlier/websockets/Gemfile
index b5d97dc9d..481b0b553 100644
--- a/appengine/flexible/ruby31-and-earlier/websockets/Gemfile
+++ b/appengine/flexible/ruby31-and-earlier/websockets/Gemfile
@@ -9,7 +9,7 @@ gem "thin"
 
 group :test do
   gem "capybara"
-  gem "poltergeist"
+  gem "cuprite"
   gem "rack-test"
   gem "rspec"
   gem "rspec_junit_formatter"
diff --git a/appengine/flexible/ruby31-and-earlier/websockets/Gemfile.lock b/appengine/flexible/ruby31-and-earlier/websockets/Gemfile.lock
index 009f32873..4230f9f18 100644
--- a/appengine/flexible/ruby31-and-earlier/websockets/Gemfile.lock
+++ b/appengine/flexible/ruby31-and-earlier/websockets/Gemfile.lock
@@ -11,22 +11,26 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (~> 1.2)
       xpath (~> 3.2)
-    cliver (0.3.2)
+    concurrent-ruby (1.2.2)
+    cuprite (0.14.3)
+      capybara (~> 3.0)
+      ferrum (~> 0.13.0)
     daemons (1.3.1)
     diff-lcs (1.3)
     eventmachine (1.2.7)
     faye-websocket (0.10.7)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
+    ferrum (0.13)
+      addressable (~> 2.5)
+      concurrent-ruby (~> 1.1)
+      webrick (~> 1.7)
+      websocket-driver (>= 0.6, < 0.8)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     mustermann (1.0.3)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
     public_suffix (3.0.3)
     rack (2.0.7)
     rack-protection (2.0.5)
@@ -47,6 +51,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    rspec_junit_formatter (0.6.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
     sinatra (2.0.5)
       mustermann (~> 1.0)
       rack (~> 2.0)
@@ -57,6 +63,7 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     tilt (2.0.9)
+    webrick (1.8.1)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
@@ -68,12 +75,13 @@ PLATFORMS
 
 DEPENDENCIES
   capybara
+  cuprite
   faye-websocket
-  poltergeist
   rack-test
   rspec
+  rspec_junit_formatter
   sinatra
   thin
 
 BUNDLED WITH
-   1.17.1
+   2.4.21
diff --git a/appengine/flexible/ruby31-and-earlier/websockets/spec/websockets_spec.rb b/appengine/flexible/ruby31-and-earlier/websockets/spec/websockets_spec.rb
index 3ec500cd3..1b46ec932 100644
--- a/appengine/flexible/ruby31-and-earlier/websockets/spec/websockets_spec.rb
+++ b/appengine/flexible/ruby31-and-earlier/websockets/spec/websockets_spec.rb
@@ -15,9 +15,9 @@
 require_relative "../app.rb"
 require "rspec"
 require "capybara/rspec"
-require "capybara/poltergeist"
+require "capybara/cuprite"
 
-Capybara.javascript_driver = :poltergeist
+Capybara.javascript_driver = :cuprite
 
 Capybara.app = Sinatra::Application
 
diff --git a/getting-started/bookshelf/Gemfile b/getting-started/bookshelf/Gemfile
index f857a6d37..421bf48d7 100644
--- a/getting-started/bookshelf/Gemfile
+++ b/getting-started/bookshelf/Gemfile
@@ -41,8 +41,7 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 group :test do
   gem "capybara"
-  gem "phantomjs", require: "phantomjs/poltergeist"
-  gem "poltergeist"
+  gem "cuprite"
   gem "rack-test"
   gem "rspec_junit_formatter"
   gem "rspec-rails"
diff --git a/getting-started/bookshelf/spec/e2e_spec_helper.rb b/getting-started/bookshelf/spec/e2e_spec_helper.rb
index 8bf2a63f7..234326a99 100644
--- a/getting-started/bookshelf/spec/e2e_spec_helper.rb
+++ b/getting-started/bookshelf/spec/e2e_spec_helper.rb
@@ -12,10 +12,10 @@
 # limitations under the License.
 
 require "spec_helper"
-require "capybara/poltergeist"
+require "capybara/cuprite"
 
-# use the poltergeist (phantomjs) driver for the test
-Capybara.current_driver = :poltergeist
+# use the cuprite (qmake) driver for the test
+Capybara.current_driver = :cuprite
 Capybara.server = :webrick
 
 RSpec.configure do |config|