diff --git a/.github/workflows/ci-ruby.yml b/.github/workflows/ci-ruby.yml
index 168456bddeb88..dd682d5cbb8e2 100644
--- a/.github/workflows/ci-ruby.yml
+++ b/.github/workflows/ci-ruby.yml
@@ -30,21 +30,21 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      
+
       - name: Install system dependencies
         run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
-      
+
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.2.8
           bundler-cache: true
           working-directory: rb
-      
+
       - name: Install RBS collection
         working-directory: rb
         run: bundle exec rbs collection install
-      
+
       - name: Run Steep type check
         working-directory: rb
         run: bundle exec rake steep 2>/dev/null || (bundle exec rake steep && exit 1)
@@ -89,13 +89,12 @@ jobs:
       matrix:
         browser:
           - chrome
-          - edge
           - firefox
         os:
           - windows
           - macos
-        exclude:
-          - browser: edge
+        include:
+          - browser: safari
             os: macos
     with:
       name: Local Tests (${{ matrix.browser }}, ${{ matrix.os }})
diff --git a/rb/spec/integration/selenium/webdriver/action_builder_spec.rb b/rb/spec/integration/selenium/webdriver/action_builder_spec.rb
index fa2ae81236a5f..e86fe47d9d850 100644
--- a/rb/spec/integration/selenium/webdriver/action_builder_spec.rb
+++ b/rb/spec/integration/selenium/webdriver/action_builder_spec.rb
@@ -38,7 +38,7 @@ module WebDriver
           expect(driver.find_element(id: 'result').text.strip).to be_empty
         end
 
-        it 'sends keys to element', only: {browser: %i[chrome edge firefox]} do
+        it 'sends keys to element' do
           driver.navigate.to url_for('formPage.html')
 
           input = driver.find_element(css: '#working')
@@ -390,7 +390,7 @@ module WebDriver
         end
 
         it 'raises MoveTargetOutOfBoundsError when origin offset is out of viewport',
-           only: {browser: %i[chrome edge firefox]} do
+           except: {browser: %i[safari safari_preview]} do
           driver.navigate.to url_for('scrolling_tests/frame_with_nested_scrolling_frame.html')
           scroll_origin = WheelActions::ScrollOrigin.viewport(-10, -10)
 
diff --git a/rb/spec/integration/selenium/webdriver/manager_spec.rb b/rb/spec/integration/selenium/webdriver/manager_spec.rb
index 059cb0dba9b0b..5e3b095f41f87 100644
--- a/rb/spec/integration/selenium/webdriver/manager_spec.rb
+++ b/rb/spec/integration/selenium/webdriver/manager_spec.rb
@@ -26,7 +26,7 @@ module WebDriver
         before { driver.navigate.to url_for('xhtmlTest.html') }
 
         after do
-          if GlobalTestEnv.rbe? && GlobalTestEnv.browser == :chrome
+          if (GlobalTestEnv.rbe? && GlobalTestEnv.browser == :chrome) || GlobalTestEnv.browser == :safari
             reset_driver!
           else
             driver.manage.delete_all_cookies
diff --git a/rb/spec/integration/selenium/webdriver/target_locator_spec.rb b/rb/spec/integration/selenium/webdriver/target_locator_spec.rb
index 52685898e2fa5..6e9da65c68d2a 100644
--- a/rb/spec/integration/selenium/webdriver/target_locator_spec.rb
+++ b/rb/spec/integration/selenium/webdriver/target_locator_spec.rb
@@ -168,8 +168,7 @@ module WebDriver
         end
       end
 
-      context 'with more than two windows', except: [{browser: %i[safari safari_preview]},
-                                                     {driver: :remote, browser: :ie}] do
+      context 'with more than two windows', except: {driver: :remote, browser: :ie} do
         it 'closes current window via block' do
           driver.navigate.to url_for('xhtmlTest.html')
           wait_for_element(link: 'Create a new anonymous window')
diff --git a/rb/spec/integration/selenium/webdriver/window_spec.rb b/rb/spec/integration/selenium/webdriver/window_spec.rb
index 84e8bc92f6071..0e31382d39240 100644
--- a/rb/spec/integration/selenium/webdriver/window_spec.rb
+++ b/rb/spec/integration/selenium/webdriver/window_spec.rb
@@ -113,7 +113,7 @@ module WebDriver
         expect(new_size.height).to be > old_size.height
       end
 
-      it 'can make window full screen', except: {browser: %i[chrome edge], headless: true} do
+      it 'can make window full screen', except: {browser: %i[safari safari_preview], ci: :github} do
         window.size = old_size = Dimension.new(700, 700)
 
         window.full_screen