3 files changed, 8 insertions, 6 deletions
diff --git a/spec/features/admin/users/user_spec.rb b/spec/features/admin/users/user_spec.rb
index ed355e4ada4..7dc329e6909 100644
--- a/spec/features/admin/users/user_spec.rb
+++ b/spec/features/admin/users/user_spec.rb
@@ -156,7 +156,7 @@ RSpec.describe 'Admin::Users::User', feature_category: :user_management do
           it 'disables impersonate button' do
             subject
 
-            impersonate_btn = find('[data-testid="impersonate_user_link"]')
+            impersonate_btn = find('[data-testid="impersonate-user-link"]')
 
             expect(impersonate_btn).not_to be_nil
             expect(impersonate_btn['disabled']).not_to be_nil
@@ -174,7 +174,7 @@ RSpec.describe 'Admin::Users::User', feature_category: :user_management do
             subject
 
             expect(page).to have_content('Impersonate')
-            impersonate_btn = find('[data-testid="impersonate_user_link"]')
+            impersonate_btn = find('[data-testid="impersonate-user-link"]')
             expect(impersonate_btn['disabled']).to be_nil
           end
         end
diff --git a/spec/features/admin/users/users_spec.rb b/spec/features/admin/users/users_spec.rb
index 8e80ce5edd9..8ee30c50a7d 100644
--- a/spec/features/admin/users/users_spec.rb
+++ b/spec/features/admin/users/users_spec.rb
@@ -350,7 +350,8 @@ RSpec.describe 'Admin::Users', feature_category: :user_management do
         let_it_be(:ghost_user) { create(:user, :ghost) }
 
         it 'does not render actions dropdown' do
-          expect(page).not_to have_css("[data-testid='user-actions-#{ghost_user.id}'] [data-testid='dropdown-toggle']")
+          expect(page).not_to have_css(
+            "[data-testid='user-actions-#{ghost_user.id}'] [data-testid='user-actions-dropdown-toggle']")
         end
       end
 
@@ -358,7 +359,8 @@ RSpec.describe 'Admin::Users', feature_category: :user_management do
         let_it_be(:bot_user) { create(:user, user_type: :alert_bot) }
 
         it 'does not render actions dropdown' do
-          expect(page).not_to have_css("[data-testid='user-actions-#{bot_user.id}'] [data-testid='dropdown-toggle']")
+          expect(page).not_to have_css(
+            "[data-testid='user-actions-#{bot_user.id}'] [data-testid='user-actions-dropdown-toggle']")
         end
       end
     end
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index ecb8a8e6f17..1bee4cc5081 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -93,7 +93,7 @@ RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state, feature_category: :grou
         visit project_job_path(project, job)
 
         within '.js-pipeline-info' do
-          expect(page).to have_content("Pipeline ##{pipeline.id} for #{pipeline.ref}")
+          expect(page).to have_content("Pipeline ##{pipeline.id} #{pipeline.status} for #{pipeline.ref}")
         end
       end
 
@@ -239,7 +239,7 @@ RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state, feature_category: :grou
 
           href = new_project_issue_path(project, options)
 
-          page.within('.build-sidebar') do
+          page.within('aside.right-sidebar') do
             expect(find('[data-testid="job-new-issue"]')['href']).to include(href)
           end
         end