diff --git a/ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue b/ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue
index df8c71375c259e39e82ffb8b00556ebee5294df1..26b171be26a9ae85e3a21a1cd2e443ccde754e0c 100644
--- a/ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue
+++ b/ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue
@@ -129,7 +129,7 @@ export default {
         {{ __("Ok let's go") }}
       </gl-link>
       <p class="small mt-8">
-        <gl-link class="qa-skip-tour-btn" data-qa-selector="skip_for_now_link" @click="skipTour">
+        <gl-link class="qa-skip-tour-btn" @click="skipTour">
           {{ skipText }}
         </gl-link>
       </p>
diff --git a/qa/qa.rb b/qa/qa.rb
index 3cbc590f1cd979534a748a49ad45b7590f88c396..d848aca9a669649a0ce1b854fc0f2019de7f82d7 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -183,7 +183,6 @@ module Main
       autoload :OAuth, 'qa/page/main/oauth'
       autoload :SignUp, 'qa/page/main/sign_up'
       autoload :Terms, 'qa/page/main/terms'
-      autoload :Onboarding, 'qa/page/main/onboarding'
     end
 
     module Settings
diff --git a/qa/qa/ee.rb b/qa/qa/ee.rb
index 65137393c7ab2d733822a7f64755e82ba1ffe17b..8c85dd0ca10efb0a42551757d2bb18b408a17ea2 100644
--- a/qa/qa/ee.rb
+++ b/qa/qa/ee.rb
@@ -49,7 +49,6 @@ module File
 
       module Main
         autoload :Banner, 'qa/ee/page/main/banner'
-        autoload :Onboarding, 'qa/ee/page/main/onboarding'
       end
 
       module Admin
diff --git a/qa/qa/ee/page/main/onboarding.rb b/qa/qa/ee/page/main/onboarding.rb
deleted file mode 100644
index 8a3bad5f4d390f18f01d70a31275876ebd67767e..0000000000000000000000000000000000000000
--- a/qa/qa/ee/page/main/onboarding.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  module EE
-    module Page
-      module Main
-        module Onboarding
-          extend QA::Page::PageConcern
-
-          def self.prepended(base)
-            super
-
-            base.class_eval do
-              view 'ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue' do
-                element :skip_for_now_link, required: true
-              end
-            end
-          end
-
-          def skip_for_now
-            click_element :skip_for_now_link, ::QA::Page::Main::Menu
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index c70c2bbd5d349c7d7936939171c6580af702f83f..8eb28eb53e7f893f90b50d4e7617db1a9ca3b93f 100644
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -165,10 +165,6 @@ def sign_in_using_gitlab_credentials(user:, skip_page_validation: false)
             terms.accept_terms if terms.visible?
           end
 
-          QA::Page::Main::Onboarding.perform do |onboarding|
-            onboarding.skip_for_now if onboarding.respond_to?(:skip_for_now) && onboarding.visible?
-          end
-
           Page::Main::Menu.validate_elements_present! unless skip_page_validation
         end
 
diff --git a/qa/qa/page/main/onboarding.rb b/qa/qa/page/main/onboarding.rb
deleted file mode 100644
index 27c2b745e8ecb86482fdca0710cf42a5c445c93d..0000000000000000000000000000000000000000
--- a/qa/qa/page/main/onboarding.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  module Page
-    module Main
-      class Onboarding < Page::Base
-      end
-    end
-  end
-end
-
-QA::Page::Main::Onboarding.prepend_if_ee('QA::EE::Page::Main::Onboarding')
diff --git a/qa/qa/page/main/terms.rb b/qa/qa/page/main/terms.rb
index bf3219a739f1ed030f4a35496c2a090c9b64d689..a0de267fb31cfd9b3c820e60a637479f3172a43d 100644
--- a/qa/qa/page/main/terms.rb
+++ b/qa/qa/page/main/terms.rb
@@ -15,7 +15,7 @@ class Terms < Page::Base
         end
 
         def accept_terms
-          click_element :accept_terms_button
+          click_element :accept_terms_button, Page::Main::Menu
         end
       end
     end