diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 8106685b3e7..eda658e0c81 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,6 +3,4 @@
 ARG RUBY_VERSION=3.3.5
 FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION
 
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends pkg-config \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN sudo apt-get update && sudo apt-get -y install --no-install-recommends pkg-config
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d05adf8a1e8..bc2ecaae758 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -34,6 +34,8 @@
   "containerEnv": {
     "EDITOR": "code --wait",
     "GIT_EDITOR": "code --wait",
+    "DEVCONTAINER_APP_HOST": "http://rails-app",
+    "MEMCACHED_ENDPOINT": "cache:11211",
     "CAPYBARA_SERVER_PORT": "45678",
     "SELENIUM_HOST": "selenium",
     "ELASTICSEARCH_URL": "http://search:9200",
diff --git a/app/views/layouts/_session.html.erb b/app/views/layouts/_session.html.erb
index 677752bc08b..468f53a2e71 100644
--- a/app/views/layouts/_session.html.erb
+++ b/app/views/layouts/_session.html.erb
@@ -1,7 +1,7 @@
 <div class="ml-3 flex text-neutral-900 dark:text-white hover:text-black dark:hover:text-neutral-400 items-center" data-controller="dialog">
   <% if signed_in? %>
     <%# This class is used in the tests :( I need it to be the same class until the old design is gone. %>
-    <%= link_to(dashboard_path, data: { action: "dialog#open", dialog_target: "button" }, class: "header__popup-link") do %>
+    <%= link_to(dashboard_path, data: { action: "dialog#open", dialog_target: "button" }, class: "header__popup-link", title: "User Dropdown Menu") do %>
       <%= avatar 64, "user_gravatar", theme: :dark, class: "h-9 w-9 rounded" %>
     <% end %>
   <% else %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index aa3422566f8..66760fe6235 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -66,7 +66,7 @@
                 <span><%= current_user.name %></span>
                 <%= avatar 80, "user_gravatar", theme: :dark %>
               </a>
-              <a href="#" class="header__popup-link" data-icon="▼" data-action="dropdown#toggle click@window->dropdown#hide">
+              <a href="#" title="User Dropdown Menu" class="header__popup-link" data-icon="▼" data-action="dropdown#toggle click@window->dropdown#hide">
                 <span class="t-hidden">More items</span>
               </a>
               <div class="header__popup__nav-links hidden" data-dropdown-target="menu" >
diff --git a/config/environments/test.rb b/config/environments/test.rb
index a65ac8280f1..cda60f8c44d 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -26,7 +26,7 @@
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-  config.cache_store = :mem_cache_store
+  config.cache_store = :mem_cache_store, ENV["MEMCACHED_ENDPOINT"]
 
   # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = :none
diff --git a/config/initializers/webauthn.rb b/config/initializers/webauthn.rb
index 59a710c0c86..f567b41d088 100644
--- a/config/initializers/webauthn.rb
+++ b/config/initializers/webauthn.rb
@@ -2,7 +2,11 @@
   config.origin = if Rails.env.development?
                     ENV.fetch("WEBAUTHN_ORIGIN", "http://localhost:3000")
                   elsif Rails.env.test?
-                    "#{Gemcutter::PROTOCOL}://#{Gemcutter::HOST}:31337"
+                    if ENV["DEVCONTAINER_APP_HOST"].present?
+                      "#{ENV['DEVCONTAINER_APP_HOST']}:#{ENV['CAPYBARA_SERVER_PORT']}"
+                    else
+                      "#{Gemcutter::PROTOCOL}://#{Gemcutter::HOST}:31337"
+                    end
                   else
                     "#{Gemcutter::PROTOCOL}://#{Gemcutter::HOST}"
                   end
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index c7f25952c16..462c51b7603 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -10,8 +10,14 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
     driven_by :selenium, using: :headless_chrome, screen_size: [1400, 1400], options: {
       browser: :remote,
       url: "http://#{ENV['SELENIUM_HOST']}:4444"
-    }
+    } do |driver|
+      driver.add_argument("--unsafely-treat-insecure-origin-as-secure=http://rails-app:#{ENV['CAPYBARA_SERVER_PORT']}")
+    end
   else
     driven_by :selenium, using: :headless_chrome, screen_size: [1400, 1400]
   end
+
+  def devcontainer?
+    ENV["DEVCONTAINER_APP_HOST"].present?
+  end
 end
diff --git a/test/helpers/email_helpers.rb b/test/helpers/email_helpers.rb
index a6c0804d135..c10e7ffe715 100644
--- a/test/helpers/email_helpers.rb
+++ b/test/helpers/email_helpers.rb
@@ -16,6 +16,6 @@ def confirmation_link
     refute_empty ActionMailer::Base.deliveries
     body = last_email.parts[1].body.decoded.to_s
     link = %r{http://localhost(?::\d+)?/email_confirmations([^";]*)}.match(body)
-    link[0]
+    URI.parse(link[0]).request_uri
   end
 end
diff --git a/test/system/api_keys_test.rb b/test/system/api_keys_test.rb
index 8b56e88f9f6..bed1117c216 100644
--- a/test/system/api_keys_test.rb
+++ b/test/system/api_keys_test.rb
@@ -16,7 +16,7 @@ class ApiKeysTest < ApplicationSystemTestCase
 
     assert_nil URI.parse(page.current_url).query
 
-    fill_in "api_key[name]", with: "test"
+    fill_in "api_key[name]", with: "test-api-key"
     check "api_key[index_rubygems]"
 
     refute page.has_content? "Enable MFA"
@@ -28,7 +28,7 @@ class ApiKeysTest < ApplicationSystemTestCase
     assert_nil @user.api_keys.last.rubygem
 
     assert_event Events::UserEvent::API_KEY_CREATED, {
-      name: "test",
+      name: "test-api-key",
       scopes: ["index_rubygems"],
       mfa: false,
       api_key_gid: @user.api_keys.last.to_global_id.to_s
@@ -43,7 +43,7 @@ class ApiKeysTest < ApplicationSystemTestCase
 
     assert_empty URI.parse(page.current_url).query
 
-    fill_in "api_key[name]", with: "test"
+    fill_in "api_key[name]", with: "test-api-key"
     check "api_key[index_rubygems]"
 
     refute page.has_content? "Enable MFA"
@@ -58,7 +58,7 @@ class ApiKeysTest < ApplicationSystemTestCase
   test "creating new api key scoped to a gem" do
     visit_profile_api_keys_path
 
-    fill_in "api_key[name]", with: "test"
+    fill_in "api_key[name]", with: "test-api-key"
     check "api_key[push_rubygem]"
 
     assert page.has_select? "api_key_rubygem_id", selected: "All Gems"
@@ -82,7 +82,7 @@ class ApiKeysTest < ApplicationSystemTestCase
   ApiKey::APPLICABLE_GEM_API_SCOPES.each do |scope|
     test "creating new api key scoped to a gem with #{scope} scope" do
       visit_profile_api_keys_path
-      fill_in "api_key[name]", with: "test"
+      fill_in "api_key[name]", with: "test-api-key"
       check "api_key[#{scope}]"
 
       assert page.has_select? "api_key_rubygem_id", selected: "All Gems"
@@ -96,7 +96,7 @@ class ApiKeysTest < ApplicationSystemTestCase
 
   test "selecting the exclusive scope deselects the other scopes and vice versa" do
     visit_profile_api_keys_path
-    fill_in "api_key[name]", with: "test"
+    fill_in "api_key[name]", with: "test-api-key"
     check "api_key[index_rubygems]"
     check "api_key[push_rubygem]"
 
@@ -125,7 +125,7 @@ class ApiKeysTest < ApplicationSystemTestCase
   test "creating new api key scoped to gem that the user does not own" do
     visit_profile_api_keys_path
 
-    fill_in "api_key[name]", with: "test"
+    fill_in "api_key[name]", with: "test-api-key"
     check "api_key[push_rubygem]"
 
     assert page.has_select? "api_key_rubygem_id", selected: "All Gems"
@@ -144,7 +144,7 @@ class ApiKeysTest < ApplicationSystemTestCase
 
     visit_profile_api_keys_path
 
-    fill_in "api_key[name]", with: "test"
+    fill_in "api_key[name]", with: "test-api-key"
     check "api_key[index_rubygems]"
     check "mfa"
     click_button "Create API Key"
@@ -158,7 +158,7 @@ class ApiKeysTest < ApplicationSystemTestCase
 
     expiration = 1.day.from_now.beginning_of_minute
 
-    fill_in "api_key[name]", with: "test"
+    fill_in "api_key[name]", with: "test-api-key"
     check "api_key[index_rubygems]"
     fill_in "api_key[expires_at]", with: expiration
     click_button "Create API Key"
@@ -173,7 +173,7 @@ class ApiKeysTest < ApplicationSystemTestCase
 
     visit_profile_api_keys_path
 
-    fill_in "api_key[name]", with: "test"
+    fill_in "api_key[name]", with: "test-api-key"
     check "api_key[index_rubygems]"
     click_button "Create API Key"
 
diff --git a/test/system/avo/manual_changes_test.rb b/test/system/avo/manual_changes_test.rb
index 8d47468e5ea..7f2722ce6f2 100644
--- a/test/system/avo/manual_changes_test.rb
+++ b/test/system/avo/manual_changes_test.rb
@@ -16,7 +16,7 @@ class Avo::ManualChangesSystemTest < ApplicationSystemTestCase
 
     page.find_by_id("log_ticket_key", wait: Capybara.default_max_wait_time) # Wait for input to be available.
     fill_in "Key", with: "key"
-    fill_in "Directory", with: "dir"
+    fill_in "Directory", with: "directory"
     fill_in "Processed count", with: "0"
     fill_in "Comment", with: "A nice long comment"
     click_on "Save"
@@ -45,7 +45,7 @@ class Avo::ManualChangesSystemTest < ApplicationSystemTestCase
         },
         "fields" => {
           "key" => "key",
-          "directory" => "dir",
+          "directory" => "directory",
           "backend" => "s3",
           "status" => "pending",
           "processed_count" => "0"
@@ -95,7 +95,7 @@ class Avo::ManualChangesSystemTest < ApplicationSystemTestCase
         },
         "fields" => {
           "key" => "Other Key",
-          "directory" => "dir",
+          "directory" => "directory",
           "backend" => "s3",
           "status" => "failed",
           "processed_count" => "2"
diff --git a/test/system/avo/rubygems_test.rb b/test/system/avo/rubygems_test.rb
index e9d9dda8c00..04893d4edde 100644
--- a/test/system/avo/rubygems_test.rb
+++ b/test/system/avo/rubygems_test.rb
@@ -5,6 +5,12 @@ class Avo::RubygemsSystemTest < ApplicationSystemTestCase
 
   include ActiveJob::TestHelper
 
+  setup do
+    # Avo records the IP Address and other IP related information when not using `localhost`, which is
+    # not something easily to calculate.
+    skip "This test cannot run in the current environment" if devcontainer?
+  end
+
   test "release reserved namespace" do
     admin_user = create(:admin_github_user, :is_admin)
     avo_sign_in_as admin_user
diff --git a/test/system/avo/users_test.rb b/test/system/avo/users_test.rb
index 19a99118c28..04295235629 100644
--- a/test/system/avo/users_test.rb
+++ b/test/system/avo/users_test.rb
@@ -5,6 +5,12 @@ class Avo::UsersSystemTest < ApplicationSystemTestCase
 
   include ActiveJob::TestHelper
 
+  setup do
+    # Avo records the IP Address and other IP related information when not using `localhost`, which is
+    # not something easily to calculate.
+    skip "This test cannot run in the current environment" if devcontainer?
+  end
+
   test "reset mfa" do
     Minitest::Test.make_my_diffs_pretty!
     admin_user = create(:admin_github_user, :is_admin)
diff --git a/test/system/avo/versions_test.rb b/test/system/avo/versions_test.rb
index 75a868ad56f..74d9baad9a5 100644
--- a/test/system/avo/versions_test.rb
+++ b/test/system/avo/versions_test.rb
@@ -5,6 +5,12 @@ class Avo::VersionsSystemTest < ApplicationSystemTestCase
 
   include ActiveJob::TestHelper
 
+  setup do
+    # Avo records the IP Address and other IP related information when not using `localhost`, which is
+    # not something easily to calculate.
+    skip "This test cannot run in the current environment" if devcontainer?
+  end
+
   test "restore a rubygem version" do
     admin_user = create(:admin_github_user, :is_admin)
     avo_sign_in_as admin_user
diff --git a/test/integration/email_confirmation_test.rb b/test/system/email_confirmation_test.rb
similarity index 69%
rename from test/integration/email_confirmation_test.rb
rename to test/system/email_confirmation_test.rb
index d55eaa3c727..590c45dc8ae 100644
--- a/test/integration/email_confirmation_test.rb
+++ b/test/system/email_confirmation_test.rb
@@ -1,7 +1,7 @@
-require "test_helper"
+require "application_system_test_case"
 require "helpers/email_helpers"
 
-class EmailConfirmationTest < SystemTest
+class EmailConfirmationTest < ApplicationSystemTestCase
   include ActiveJob::TestHelper
 
   setup do
@@ -19,7 +19,7 @@ def request_confirmation_mail(email)
   test "requesting confirmation mail does not tell if a user exists" do
     request_confirmation_mail "someone@example.com"
 
-    assert page.has_content? "We will email you confirmation link to activate your account if one exists."
+    assert_text "We will email you confirmation link to activate your account if one exists."
   end
 
   test "requesting confirmation mail with email of existing user" do
@@ -30,8 +30,8 @@ def request_confirmation_mail(email)
     assert_not_nil link
     visit link
 
-    assert page.has_content? "Sign in"
-    assert page.has_selector? "#flash_notice", text: "Your email address has been verified"
+    assert_text "Sign in"
+    assert_selector "#flash_notice", text: "Your email address has been verified"
   end
 
   test "re-using confirmation link, asks user to double check the link" do
@@ -40,13 +40,13 @@ def request_confirmation_mail(email)
     link = last_email_link
     visit link
 
-    assert page.has_content? "Sign in"
-    assert page.has_selector? "#flash_notice", text: "Your email address has been verified"
+    assert_text "SIGN IN"
+    assert_selector "#flash_notice", text: "Your email address has been verified"
 
     visit link
 
-    assert page.has_content? "Sign in"
-    assert page.has_selector? "#flash_alert", text: "Please double check the URL or try submitting it again."
+    assert_text "SIGN IN"
+    assert_selector "#flash_alert", text: "Please double check the URL or try submitting it again."
   end
 
   test "requesting multiple confirmation email" do
@@ -77,8 +77,8 @@ def request_confirmation_mail(email)
     fill_in "otp", with: ROTP::TOTP.new(@user.totp_seed).now
     click_button "Authenticate"
 
-    assert page.has_content? "Sign in"
-    assert page.has_selector? "#flash_notice", text: "Your email address has been verified"
+    assert_text "Sign in"
+    assert_selector "#flash_notice", text: "Your email address has been verified"
   end
 
   test "requesting confirmation mail with webauthn enabled" do
@@ -91,15 +91,15 @@ def request_confirmation_mail(email)
     assert_not_nil link
     visit link
 
-    assert page.has_content? "Multi-factor authentication"
-    assert page.has_content? "Security Device"
+    assert_text "Multi-factor authentication"
+    assert_text "Security Device"
 
     click_on "Authenticate with security device"
 
-    assert page.has_content? "Sign in"
+    assert_text "SIGN IN"
     skip("There's a glitch where the webauthn javascript(?) triggers the next page to render twice, clearing flash.")
 
-    assert page.has_selector? "#flash_notice", text: "Your email address has been verified"
+    assert_selector "#flash_notice", text: "Your email address has been verified"
   end
 
   test "requesting confirmation mail with webauthn enabled using recovery codes" do
@@ -112,14 +112,14 @@ def request_confirmation_mail(email)
     assert_not_nil link
     visit link
 
-    assert page.has_content? "Multi-factor authentication"
-    assert page.has_content? "Security Device"
+    assert_text "Multi-factor authentication"
+    assert_text "Security Device"
 
     fill_in "otp", with: @mfa_recovery_codes.first
     click_button "Authenticate"
 
-    assert page.has_content? "Sign in"
-    assert page.has_selector? "#flash_notice", text: "Your email address has been verified"
+    assert_text "Sign in"
+    assert_selector "#flash_notice", text: "Your email address has been verified"
   end
 
   test "requesting confirmation mail with mfa enabled, but mfa session is expired" do
@@ -135,7 +135,7 @@ def request_confirmation_mail(email)
     travel 16.minutes do
       click_button "Authenticate"
 
-      assert page.has_content? "Your login page session has expired."
+      assert_text "Your login page session has expired."
     end
   end
 
diff --git a/test/system/multifactor_auths_test.rb b/test/system/multifactor_auths_test.rb
index 69a06758f53..6681dc6d21f 100644
--- a/test/system/multifactor_auths_test.rb
+++ b/test/system/multifactor_auths_test.rb
@@ -144,8 +144,6 @@ class MultifactorAuthsTest < ApplicationSystemTestCase
     end
 
     should "user with webauthn can change mfa level" do
-      fullscreen_headless_chrome_driver
-
       sign_in
       visit edit_settings_path
 
diff --git a/test/integration/owner_test.rb b/test/system/owner_test.rb
similarity index 81%
rename from test/integration/owner_test.rb
rename to test/system/owner_test.rb
index e13015369cc..10ed4258928 100644
--- a/test/integration/owner_test.rb
+++ b/test/system/owner_test.rb
@@ -1,7 +1,8 @@
-require "test_helper"
+require "application_system_test_case"
 
-class OwnerTest < SystemTest
+class OwnerTest < ApplicationSystemTestCase
   include ActiveJob::TestHelper
+  include ActionMailer::TestHelper
   include RubygemsHelper
 
   setup do
@@ -90,7 +91,9 @@ class OwnerTest < SystemTest
       end
     end
 
-    refute page.has_selector? ".owners__table a[href='#{profile_path(@other_user)}']"
+    accept_confirm
+
+    refute_selector ".owners__table a[href='#{profile_path(@other_user)}']"
 
     perform_enqueued_jobs only: ActionMailer::MailDeliveryJob
 
@@ -106,8 +109,10 @@ class OwnerTest < SystemTest
       click_button "Remove"
     end
 
-    assert page.has_selector?("a[href='#{profile_path(@user.display_id)}']")
-    assert page.has_selector? "#flash_alert", text: "Can't remove the only owner of the gem"
+    accept_confirm
+
+    assert_selector("a[href='#{profile_path(@user.display_id)}']")
+    assert_selector "#flash_alert", text: "Can't remove the only owner of the gem"
 
     perform_enqueued_jobs only: ActionMailer::MailDeliveryJob
 
@@ -115,7 +120,11 @@ class OwnerTest < SystemTest
   end
 
   test "verify using webauthn" do
-    create_webauthn_credential
+    create_webauthn_credential_while_signed_in
+
+    visit dashboard_path
+    click_on "User Dropdown Menu"
+    click_link(nil, href: "/sign_out")
 
     visit sign_in_path
     click_button "Authenticate with security device"
@@ -124,15 +133,18 @@ class OwnerTest < SystemTest
     visit rubygem_path(@rubygem.slug)
     click_link "Ownership"
 
-    assert page.has_css? "#verify_password_password"
+    assert_css "#verify_password_password"
 
     click_button "Authenticate with security device"
 
-    page.assert_text "add or remove owners"
+    assert_text "add or remove owners"
   end
 
   test "verify failure using webauthn shows error" do
-    create_webauthn_credential
+    create_webauthn_credential_while_signed_in
+    visit dashboard_path
+    click_on "User Dropdown Menu"
+    click_link(nil, href: "/sign_out")
 
     visit sign_in_path
     click_button "Authenticate with security device"
@@ -141,14 +153,14 @@ class OwnerTest < SystemTest
     visit rubygem_path(@rubygem.slug)
     click_link "Ownership"
 
-    assert page.has_css? "#verify_password_password"
+    assert_css "#verify_password_password"
 
     @user.webauthn_credentials.find_each { |c| c.update!(external_id: "a") }
 
     click_button "Authenticate with security device"
 
-    page.assert_text "Credentials required"
-    assert page.has_css? "#verify_password_password"
+    assert_text "Credentials required"
+    assert_css "#verify_password_password"
   end
 
   test "verify password again after 10 minutes" do
@@ -157,7 +169,7 @@ class OwnerTest < SystemTest
     visit rubygem_path(@rubygem.slug)
     click_link "Ownership"
 
-    assert page.has_field? "Password"
+    assert_field "Password"
     fill_in "Password", with: PasswordHelpers::SECURE_TEST_PASSWORD
     click_button "Confirm"
   end
@@ -166,27 +178,27 @@ class OwnerTest < SystemTest
     visit rubygem_path(@rubygem.slug)
     click_link "Ownership"
 
-    assert page.has_css? "#verify_password_password"
+    assert_css "#verify_password_password"
     fill_in "Password", with: "wrong password"
     click_button "Confirm"
 
-    assert page.has_selector? "#flash_alert", text: "This request was denied. We could not verify your password."
+    assert_selector "#flash_alert", text: "This request was denied. We could not verify your password."
   end
 
   test "incorrect password error does not persist after correct password" do
     visit rubygem_path(@rubygem.slug)
     click_link "Ownership"
 
-    assert page.has_css? "#verify_password_password"
+    assert_css "#verify_password_password"
     fill_in "Password", with: "wrong password"
     click_button "Confirm"
 
-    assert page.has_selector? "#flash_alert", text: "This request was denied. We could not verify your password."
+    assert_selector "#flash_alert", text: "This request was denied. We could not verify your password."
 
     fill_in "Password", with: PasswordHelpers::SECURE_TEST_PASSWORD
     click_button "Confirm"
 
-    assert page.has_no_selector? "#flash_alert"
+    assert_no_selector "#flash_alert"
   end
 
   test "clicking on confirmation link confirms the account" do
@@ -197,8 +209,8 @@ class OwnerTest < SystemTest
       visit confirmation_link
     end
 
-    assert_equal page.current_path, rubygem_path(@rubygem.slug)
-    assert page.has_selector? "#flash_notice", text: "You were added as an owner to #{@rubygem.name} gem"
+    assert_current_path rubygem_path(@rubygem.slug)
+    assert_selector "#flash_notice", text: "You were added as an owner to #{@rubygem.name} gem"
 
     assert_emails 2
 
@@ -220,32 +232,35 @@ class OwnerTest < SystemTest
   test "shows ownership link when is owner" do
     visit rubygem_path(@rubygem.slug)
 
-    assert page.has_selector?("a[href='#{rubygem_owners_path(@rubygem.slug)}']")
+    assert_selector("a[href='#{rubygem_owners_path(@rubygem.slug)}']")
   end
 
   test "hides ownership link when not owner" do
+    click_on "User Dropdown Menu"
     page.click_link(nil, href: "/sign_out")
     sign_in_as(@other_user)
     visit rubygem_path(@rubygem.slug)
 
-    refute page.has_selector?("a[href='#{rubygem_owners_path(@rubygem.slug)}']")
+    assert_no_selector("a[href='#{rubygem_owners_path(@rubygem.slug)}']")
   end
 
   test "hides ownership link when not signed in" do
+    click_on "User Dropdown Menu"
     page.click_link(nil, href: "/sign_out")
     visit rubygem_path(@rubygem.slug)
 
-    refute page.has_selector?("a[href='#{rubygem_owners_path(@rubygem.slug)}']")
+    assert_no_selector("a[href='#{rubygem_owners_path(@rubygem.slug)}']")
   end
 
   test "shows resend confirmation link when unconfirmed" do
+    click_on "User Dropdown Menu"
     page.click_link(nil, href: "/sign_out")
     create(:ownership, :unconfirmed, user: @other_user, rubygem: @rubygem)
     sign_in_as(@other_user)
     visit rubygem_path(@rubygem.slug)
 
-    refute page.has_selector?("a[href='#{rubygem_owners_path(@rubygem.slug)}']")
-    assert page.has_selector?("a[href='#{resend_confirmation_rubygem_owners_path(@rubygem.slug)}']")
+    assert_no_selector("a[href='#{rubygem_owners_path(@rubygem.slug)}']")
+    assert_selector("a[href='#{resend_confirmation_rubygem_owners_path(@rubygem.slug)}']")
   end
 
   test "deleting unconfirmed owner user" do
diff --git a/test/integration/password_reset_test.rb b/test/system/password_reset_test.rb
similarity index 78%
rename from test/integration/password_reset_test.rb
rename to test/system/password_reset_test.rb
index 327ff07a8a0..4303de8c31a 100644
--- a/test/integration/password_reset_test.rb
+++ b/test/system/password_reset_test.rb
@@ -1,12 +1,12 @@
-require "test_helper"
+require "application_system_test_case"
 
-class PasswordResetTest < SystemTest
+class PasswordResetTest < ApplicationSystemTestCase
   include ActiveJob::TestHelper
 
   def password_reset_link
     body = ActionMailer::Base.deliveries.last.parts[1].body.decoded.to_s
     link = %r{http://localhost(?::\d+)?/password([^";]*)}.match(body)
-    link[0]
+    URI.parse(link[0]).request_uri
   end
 
   setup do
@@ -24,7 +24,7 @@ def forgot_password_with(email)
   test "reset password form does not tell if a user exists" do
     forgot_password_with "someone@example.com"
 
-    assert page.has_content? "instructions for changing your password"
+    assert_text "instructions for changing your password"
   end
 
   test "resetting password without handle" do
@@ -44,7 +44,9 @@ def forgot_password_with(email)
     fill_in "Password", with: PasswordHelpers::SECURE_TEST_PASSWORD
     click_button "Sign in"
 
-    assert page.has_content? "Sign out"
+    click_on "User Dropdown Menu"
+
+    assert_text "Sign out"
   end
 
   test "resetting a password with a blank or short password" do
@@ -55,22 +57,22 @@ def forgot_password_with(email)
     fill_in "Password", with: ""
     click_button "Save this password"
 
-    assert page.has_content? "Your password could not be changed. Please try again."
-    assert page.has_content? "Password can't be blank"
-    assert page.has_content? "Reset password"
+    assert_text "Your password could not be changed. Please try again."
+    assert_text "Password can't be blank"
+    assert_text "Reset password"
 
     # try again with short password
     fill_in "Password", with: "pass"
     click_button "Save this password"
 
-    assert page.has_content? "Password is too short (minimum is 10 characters)"
-    assert page.has_content? "Reset password"
+    assert_text "Password is too short (minimum is 10 characters)"
+    assert_text "Reset password"
 
     # try again with valid password
     fill_in "Password", with: PasswordHelpers::SECURE_TEST_PASSWORD
     click_button "Save this password"
 
-    assert_equal sign_in_path, page.current_path
+    assert_current_path sign_in_path
     assert @user.reload.authenticated? PasswordHelpers::SECURE_TEST_PASSWORD
   end
 
@@ -84,7 +86,7 @@ def forgot_password_with(email)
     travel 16.minutes do
       click_button "Save this password"
 
-      assert page.has_content? "verification has expired. Please verify again."
+      assert_text "verification has expired. Please verify again."
     end
   end
 
@@ -104,12 +106,10 @@ def forgot_password_with(email)
 
     visit password_reset_link
 
-    assert page.has_content?("Sign out")
-
     fill_in "Password", with: PasswordHelpers::SECURE_TEST_PASSWORD
     click_button "Save this password"
 
-    assert_equal sign_in_path, page.current_path
+    assert_current_path sign_in_path
     assert @user.reload.authenticated? PasswordHelpers::SECURE_TEST_PASSWORD
 
     assert_event Events::UserEvent::PASSWORD_CHANGED, {},
@@ -122,17 +122,17 @@ def forgot_password_with(email)
 
     visit password_reset_link
 
-    refute page.has_content?("Sign out")
+    assert_no_text("Sign out")
 
     fill_in "otp", with: ROTP::TOTP.new(@user.totp_seed).now
     click_button "Authenticate"
 
-    refute page.has_content?("Sign out")
+    assert_no_text("Sign out")
 
     fill_in "Password", with: PasswordHelpers::SECURE_TEST_PASSWORD
     click_button "Save this password"
 
-    assert_equal sign_in_path, page.current_path
+    assert_current_path sign_in_path
     assert @user.reload.authenticated? PasswordHelpers::SECURE_TEST_PASSWORD
   end
 
@@ -146,7 +146,7 @@ def forgot_password_with(email)
     travel 16.minutes do
       click_button "Authenticate"
 
-      assert page.has_content? "Your login page session has expired."
+      assert_text "Your login page session has expired."
     end
   end
 
@@ -157,8 +157,8 @@ def forgot_password_with(email)
 
     visit password_reset_link
 
-    assert page.has_content? "Multi-factor authentication"
-    assert page.has_content? "Security Device"
+    assert_text "Multi-factor authentication"
+    assert_text "Security Device"
     assert_not_nil page.find(".js-webauthn-session--form")[:action]
 
     click_on "Authenticate with security device"
@@ -166,8 +166,8 @@ def forgot_password_with(email)
     fill_in "Password", with: PasswordHelpers::SECURE_TEST_PASSWORD
     click_button "Save this password"
 
-    assert page.has_content?("Sign in")
-    assert_equal sign_in_path, page.current_path
+    assert_text("Sign in")
+    assert_current_path sign_in_path
     assert @user.reload.authenticated? PasswordHelpers::SECURE_TEST_PASSWORD
   end
 
@@ -178,10 +178,10 @@ def forgot_password_with(email)
 
     visit password_reset_link
 
-    refute page.has_content? "Sign out"
-    assert page.has_content? "Multi-factor authentication"
-    assert page.has_content? "Security Device"
-    assert page.has_content? "Recovery code"
+    assert_no_text "Sign out"
+    assert_text "Multi-factor authentication"
+    assert_text "Security Device"
+    assert_text "Recovery code"
     assert_not_nil page.find(".js-webauthn-session--form")[:action]
 
     fill_in "otp", with: @mfa_recovery_codes.first
@@ -190,8 +190,8 @@ def forgot_password_with(email)
     fill_in "Password", with: PasswordHelpers::SECURE_TEST_PASSWORD
     click_button "Save this password"
 
-    assert page.has_content?("Sign in")
-    assert_equal sign_in_path, page.current_path
+    assert_text("Sign in")
+    assert_current_path sign_in_path
     assert @user.reload.authenticated? PasswordHelpers::SECURE_TEST_PASSWORD
   end
 
@@ -214,6 +214,7 @@ def forgot_password_with(email)
 
     assert_equal new_email, @user.reload.unconfirmed_email
 
+    click_on "User Dropdown Menu"
     click_link "Sign out"
 
     forgot_password_with email
@@ -233,12 +234,6 @@ def forgot_password_with(email)
     forgot_password_with @user.email
 
     assert_empty ActionMailer::Base.deliveries
-    page.assert_text "instructions for changing your password"
-  end
-
-  teardown do
-    @authenticator&.remove!
-    Capybara.reset_sessions!
-    Capybara.use_default_driver
+    assert_text "instructions for changing your password"
   end
 end
diff --git a/test/system/sign_in_webauthn_test.rb b/test/system/sign_in_webauthn_test.rb
index 24c8ff26395..c24b392e384 100644
--- a/test/system/sign_in_webauthn_test.rb
+++ b/test/system/sign_in_webauthn_test.rb
@@ -24,12 +24,12 @@ class SignInWebauthnTest < ApplicationSystemTestCase
     fill_in "Password", with: @user.password
     click_button "Sign in"
 
-    assert page.has_content? "Multi-factor authentication"
-    assert page.has_content? "Security Device"
+    assert_text "Multi-factor authentication"
+    assert_text "Security Device"
 
     click_on "Authenticate with security device"
 
-    assert page.has_content? "Dashboard"
+    assert_text "Dashboard"
     refute page.has_content? "We now support security devices!"
   end
 
@@ -40,14 +40,14 @@ class SignInWebauthnTest < ApplicationSystemTestCase
     fill_in "Password", with: @user.password
     click_button "Sign in"
 
-    assert page.has_content? "Multi-factor authentication"
-    assert page.has_content? "Security Device"
+    assert_text "Multi-factor authentication"
+    assert_text "Security Device"
 
     travel 30.minutes do
       click_on "Authenticate with security device"
 
-      assert page.has_content? "Your login page session has expired."
-      assert page.has_content? "Sign in"
+      assert_text "Your login page session has expired."
+      assert_text "Sign in"
     end
   end
 
@@ -58,15 +58,15 @@ class SignInWebauthnTest < ApplicationSystemTestCase
     fill_in "Password", with: @user.password
     click_button "Sign in"
 
-    assert page.has_content? "Multi-factor authentication"
-    assert page.has_content? "Security Device"
+    assert_text "Multi-factor authentication"
+    assert_text "Security Device"
 
     @user.update!(webauthn_id: "a")
 
     click_on "Authenticate with security device"
 
     refute page.has_content? "Dashboard"
-    assert page.has_content? "Sign in"
+    assert_text "Sign in"
   end
 
   test "sign in with webauthn mfa using recovery codes" do
@@ -76,13 +76,13 @@ class SignInWebauthnTest < ApplicationSystemTestCase
     fill_in "Password", with: @user.password
     click_button "Sign in"
 
-    assert page.has_content? "Multi-factor authentication"
-    assert page.has_content? "Security Device"
+    assert_text "Multi-factor authentication"
+    assert_text "Security Device"
 
     fill_in "otp", with: @mfa_recovery_codes.first
     click_button "Authenticate"
 
-    assert page.has_content? "Dashboard"
+    assert_text "Dashboard"
   end
 
   test "sign in with webauthn" do
@@ -90,7 +90,7 @@ class SignInWebauthnTest < ApplicationSystemTestCase
 
     click_on "Authenticate with security device"
 
-    assert page.has_content? "Dashboard"
+    assert_text "Dashboard"
     refute page.has_content? "We now support security devices!"
   end
 
@@ -112,7 +112,7 @@ class SignInWebauthnTest < ApplicationSystemTestCase
     click_on "Authenticate with security device"
 
     refute page.has_content? "Dashboard"
-    assert page.has_content? "Sign in"
+    assert_text "Sign in"
   end
 
   test "sign in with webauthn does not expire" do
@@ -121,7 +121,7 @@ class SignInWebauthnTest < ApplicationSystemTestCase
     travel 30.minutes do
       click_on "Authenticate with security device"
 
-      assert page.has_content? "Dashboard"
+      assert_text "Dashboard"
     end
   end
 
@@ -132,8 +132,8 @@ class SignInWebauthnTest < ApplicationSystemTestCase
     click_on "Authenticate with security device"
 
     refute page.has_content? "Dashboard"
-    assert page.has_content? "Sign in"
-    assert page.has_content? "Your account was blocked by rubygems team. Please email support@rubygems.org to recover your account."
+    assert_text "Sign in"
+    assert_text "Your account was blocked by rubygems team. Please email support@rubygems.org to recover your account."
   end
 
   test "sign in with webauthn to deleted account" do
@@ -143,6 +143,6 @@ class SignInWebauthnTest < ApplicationSystemTestCase
     click_on "Authenticate with security device"
 
     refute page.has_content? "Dashboard"
-    assert page.has_content? "Sign in"
+    assert_text "Sign in"
   end
 end
diff --git a/test/system/webauthn_verification_test.rb b/test/system/webauthn_verification_test.rb
index bc3213e4040..7f756a0c4f0 100644
--- a/test/system/webauthn_verification_test.rb
+++ b/test/system/webauthn_verification_test.rb
@@ -10,6 +10,8 @@ class WebAuthnVerificationTest < ApplicationSystemTestCase
   end
 
   test "when verifying webauthn credential" do
+    skip "Test cannot be run on the current environment" if devcontainer?
+
     visit webauthn_verification_path(webauthn_token: @verification.path_token, params: { port: @port })
 
     assert_match "Authenticate with Security Device", page.html
@@ -25,6 +27,8 @@ class WebAuthnVerificationTest < ApplicationSystemTestCase
   end
 
   test "when verifying webauthn credential on safari" do
+    skip "Test cannot be run on the current environment" if devcontainer?
+
     assert_poll_status("pending")
     visit webauthn_verification_path(webauthn_token: @verification.path_token, params: { port: @port })
 
@@ -81,8 +85,8 @@ class WebAuthnVerificationTest < ApplicationSystemTestCase
     @mock_client.response = @mock_client.bad_request_response
     visit webauthn_verification_path(webauthn_token: @verification.path_token, params: { port: @port })
 
-    assert_match "Authenticate with Security Device", page.html
-    assert_match "Authenticating as #{@user.handle}", page.html
+    assert_text "Authenticate with Security Device"
+    assert_text "AUTHENTICATING AS #{@user.handle.upcase}"
 
     click_on "Authenticate"
 
@@ -97,14 +101,14 @@ class WebAuthnVerificationTest < ApplicationSystemTestCase
     visit webauthn_verification_path(webauthn_token: @verification.path_token, params: { port: @port })
 
     travel 3.minutes do
-      assert_match "Authenticate with Security Device", page.html
-      assert_match "Authenticating as #{@user.handle}", page.html
+      assert_text "Authenticate with Security Device"
+      assert_text "AUTHENTICATING AS #{@user.handle.upcase}"
 
       click_on "Authenticate"
 
       assert redirect_to(failed_verification_webauthn_verification_path)
-      assert page.has_content?("The token in the link you used has either expired or been used already.")
-      assert page.has_content?("Please close this browser and try again.")
+      assert_text("The token in the link you used has either expired or been used already.")
+      assert_text("Please close this browser and try again.")
       assert_failed_verification_not_found
     end
   end
@@ -113,7 +117,6 @@ def teardown
     @mock_client.kill_server
     @authenticator&.remove!
     Capybara.reset_sessions!
-    Capybara.use_default_driver
   end
 
   private
@@ -121,7 +124,7 @@ def teardown
   def assert_link_is_expired
     visit webauthn_verification_path(webauthn_token: @verification.path_token, params: { port: @port })
 
-    assert page.has_content?("The token in the link you used has either expired or been used already.")
+    assert_text("The token in the link you used has either expired or been used already.")
   end
 
   def assert_poll_status(status)
@@ -133,19 +136,18 @@ def assert_poll_status(status)
     visit status_api_v1_webauthn_verification_path(webauthn_token: @verification.path_token, format: :json)
 
     assert_equal status, JSON.parse(page.text)["status"]
-    fullscreen_headless_chrome_driver
   end
 
   def assert_successful_verification_not_found
     visit successful_verification_webauthn_verification_path
 
-    assert page.has_content?("Page not found.")
+    assert_text("Page not found.")
   end
 
   def assert_failed_verification_not_found
     visit failed_verification_webauthn_verification_path
 
-    assert page.has_content?("Page not found.")
+    assert_text("Page not found.")
   end
 
   class MockClientServer
diff --git a/test/test_helper.rb b/test/test_helper.rb
index ea5aaba7cf0..2ed1d363034 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -56,11 +56,13 @@
   end
 end
 
-Capybara.default_max_wait_time = 2
-Capybara.app_host = "#{Gemcutter::PROTOCOL}://#{Gemcutter::HOST}"
-Capybara.always_include_port = true
-Capybara.server_port = 31_337
-Capybara.server = :puma, { Silent: true }
+if ENV["DEVCONTAINER_APP_HOST"].blank?
+  Capybara.default_max_wait_time = 2
+  Capybara.app_host = "#{Gemcutter::PROTOCOL}://#{Gemcutter::HOST}"
+  Capybara.always_include_port = true
+  Capybara.server_port = 31_337
+  Capybara.server = :puma, { Silent: true }
+end
 
 GoodJob::Execution.delete_all
 
@@ -123,6 +125,10 @@ def requires_avo_pro
     skip "avo pro is not present but was required for this test"
   end
 
+  def devcontainer?
+    ENV["DEVCONTAINER_APP_HOST"].present?
+  end
+
   def assert_changed(object, *attributes)
     original_attributes = attributes.index_with { |a| object.send(a) }
     yield if block_given?
@@ -144,23 +150,7 @@ def assert_event(tag, expected_additional, actual)
     assert_equal actual.additional_type.new(user_agent_info:, **expected_additional), actual.additional
   end
 
-  def headless_chrome_driver
-    Capybara.current_driver = :selenium_chrome_headless
-    Capybara.default_max_wait_time = 2
-    Selenium::WebDriver.logger.level = :error
-  end
-
-  def fullscreen_headless_chrome_driver
-    headless_chrome_driver
-    driver = page.driver
-    fullscreen_width = 1200
-    fullscreen_height = 1000
-    driver.resize_window_to(driver.current_window_handle, fullscreen_width, fullscreen_height)
-  end
-
   def create_webauthn_credential
-    fullscreen_headless_chrome_driver
-
     visit sign_in_path
     fill_in "Email or Username", with: @user.reload.email
     fill_in "Password", with: @user.password