diff --git a/app/views/admin/users/_users.html.haml b/app/views/admin/users/_users.html.haml
index bbb068c3680e21d379ff29bd15b473baab795048..3daf3fe19227663e809457f122161cf9290d2fe5 100644
--- a/app/views/admin/users/_users.html.haml
+++ b/app/views/admin/users/_users.html.haml
@@ -53,12 +53,12 @@
     = render Pajamas::ButtonComponent.new(variant: :confirm, href: new_admin_user_path) do
       = s_('AdminUsers|New user')
 
-.filtered-search-block.row-content-block.border-top-0
+.row-content-block.gl-border-0{ data: { testid: "filtered-search-block" } }
   = form_tag admin_users_path, method: :get do
     - if params[:filter].present?
       = hidden_field_tag "filter", h(params[:filter])
     .search-holder
-      .search-field-holder.gl-mb-4
+      .search-field-holder
         = search_field_tag :search_query, params[:search_query], placeholder: s_('AdminUsers|Search by name, email, or username'), class: 'form-control search-text-input js-search-input', spellcheck: false, data: { testid: 'user-search-field' }
         - if @sort.present?
           = hidden_field_tag :sort, @sort
diff --git a/spec/features/admin/users/users_spec.rb b/spec/features/admin/users/users_spec.rb
index 170c25457441de59437c76f369927f8089bb74c8..d3fe47605174353cb083f2a66d0a7ef604b67ee3 100644
--- a/spec/features/admin/users/users_spec.rb
+++ b/spec/features/admin/users/users_spec.rb
@@ -665,7 +665,7 @@ def second_row
   end
 
   def sort_by(option)
-    page.within('.filtered-search-block') do
+    within_testid('filtered-search-block') do
       find('.gl-new-dropdown').click
       select_listbox_item(option)
     end