diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
index 29ff9c44e44c..0fc1ec228ac4 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
@@ -502,9 +502,9 @@ exports[`DataTable behaves as expected selection should render and match snapsho
         >
           <div
             aria-expanded="false"
-            aria-label="button"
+            aria-label=""
             class="cds--search-magnifier"
-            role="button"
+            role=""
             tabindex="-1"
           >
             <svg
@@ -936,9 +936,9 @@ exports[`DataTable renders as expected - Component API should render and match s
         >
           <div
             aria-expanded="false"
-            aria-label="button"
+            aria-label=""
             class="cds--search-magnifier"
-            role="button"
+            role=""
             tabindex="-1"
           >
             <svg
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap
index ed72a1b8d634..1bddae3308ee 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap
@@ -9,9 +9,9 @@ exports[`TableToolbarSearch renders as expected - Component API should render 1`
   >
     <div
       aria-expanded="false"
-      aria-label="button"
+      aria-label=""
       class="cds--search-magnifier"
-      role="button"
+      role=""
       tabindex="-1"
     >
       <svg
diff --git a/packages/react/src/components/Search/Search-test.js b/packages/react/src/components/Search/Search-test.js
index 4e9a82c2cbbc..bd5b85973620 100644
--- a/packages/react/src/components/Search/Search-test.js
+++ b/packages/react/src/components/Search/Search-test.js
@@ -154,8 +154,9 @@ describe('Search', () => {
     it('should have tabbable input and untabbable button if not expandable', async () => {
       render(<Search labelText="test-search" />);
 
-      // will have 2 buttons which is the close button and div with a role button
-      expect(screen.getAllByRole('button').length).toBe(2);
+      // will have 1 button which is the close button
+      expect(screen.getAllByRole('button').length).toBe(1);
+      // search icon not tabbable if not exandable
       expect(screen.getByRole('searchbox')).not.toHaveAttribute(
         'tabIndex',
         '-1'