diff --git a/packages/clay-core/src/table/__tests__/__snapshots__/BasicRendering.tsx.snap b/packages/clay-core/src/table/__tests__/__snapshots__/BasicRendering.tsx.snap
index 3c520042b0..1d4acc92fa 100644
--- a/packages/clay-core/src/table/__tests__/__snapshots__/BasicRendering.tsx.snap
+++ b/packages/clay-core/src/table/__tests__/__snapshots__/BasicRendering.tsx.snap
@@ -37,7 +37,6 @@ exports[`Table basic rendering render dynamic content 1`] = `
               class="dropdown"
             >
               <button
-                aria-controls="clay-id-12"
                 aria-haspopup="true"
                 aria-label="Manage Columns Visibility"
                 class="dropdown-toggle btn btn-monospaced btn-outline-borderless btn-outline-secondary"
@@ -193,7 +192,6 @@ exports[`Table basic rendering render static content 1`] = `
               class="dropdown"
             >
               <button
-                aria-controls="clay-id-4"
                 aria-haspopup="true"
                 aria-label="Manage Columns Visibility"
                 class="dropdown-toggle btn btn-monospaced btn-outline-borderless btn-outline-secondary"
@@ -423,7 +421,6 @@ exports[`Table basic rendering render with sort column 1`] = `
               class="dropdown"
             >
               <button
-                aria-controls="clay-id-20"
                 aria-haspopup="true"
                 aria-label="Manage Columns Visibility"
                 class="dropdown-toggle btn btn-monospaced btn-outline-borderless btn-outline-secondary"
@@ -584,7 +581,6 @@ exports[`Table basic rendering render with treegrid 1`] = `
               class="dropdown"
             >
               <button
-                aria-controls="clay-id-28"
                 aria-haspopup="true"
                 aria-label="Manage Columns Visibility"
                 class="dropdown-toggle btn btn-monospaced btn-outline-borderless btn-outline-secondary"
diff --git a/packages/clay-pagination-bar/src/__tests__/__snapshots__/index.tsx.snap b/packages/clay-pagination-bar/src/__tests__/__snapshots__/index.tsx.snap
index 1db8890707..7530094387 100644
--- a/packages/clay-pagination-bar/src/__tests__/__snapshots__/index.tsx.snap
+++ b/packages/clay-pagination-bar/src/__tests__/__snapshots__/index.tsx.snap
@@ -99,7 +99,6 @@ exports[`ClayPaginationBar renders 1`] = `
             class="dropdown"
           >
             <button
-              aria-controls="clay-id-5"
               aria-haspopup="true"
               aria-label="Show pages 4 through 9"
               class="dropdown-toggle page-link btn btn-unstyled"
@@ -128,6 +127,7 @@ exports[`ClayPaginationBar renders 1`] = `
             aria-label="Go to the next page, 2"
             class="page-link"
             data-testid="nextArrow"
+            role="button"
             tabindex="0"
           >
             <svg
@@ -220,7 +220,6 @@ exports[`ClayPaginationBar renders without a DropDown 1`] = `
             class="dropdown"
           >
             <button
-              aria-controls="clay-id-8"
               aria-haspopup="true"
               aria-label="Show pages 4 through 9"
               class="dropdown-toggle page-link btn btn-unstyled"
@@ -249,6 +248,7 @@ exports[`ClayPaginationBar renders without a DropDown 1`] = `
             aria-label="Go to the next page, 2"
             class="page-link"
             data-testid="nextArrow"
+            role="button"
             tabindex="0"
           >
             <svg
diff --git a/packages/clay-pagination/src/__tests__/__snapshots__/index.tsx.snap b/packages/clay-pagination/src/__tests__/__snapshots__/index.tsx.snap
index dba61b4824..147d8956a4 100644
--- a/packages/clay-pagination/src/__tests__/__snapshots__/index.tsx.snap
+++ b/packages/clay-pagination/src/__tests__/__snapshots__/index.tsx.snap
@@ -15,6 +15,7 @@ exports[`ClayPagination renders 1`] = `
           aria-label="Go to the previous page, 11"
           class="page-link"
           data-testid="prevArrow"
+          role="button"
           tabindex="0"
         >
           <svg
@@ -45,7 +46,6 @@ exports[`ClayPagination renders 1`] = `
           class="dropdown"
         >
           <button
-            aria-controls="clay-id-2"
             aria-haspopup="true"
             aria-label="Show pages 2 through 9"
             class="dropdown-toggle page-link btn btn-unstyled"
@@ -118,7 +118,6 @@ exports[`ClayPagination renders 1`] = `
           class="dropdown"
         >
           <button
-            aria-controls="clay-id-4"
             aria-haspopup="true"
             aria-label="Show pages 15 through 24"
             class="dropdown-toggle page-link btn btn-unstyled"
@@ -147,6 +146,7 @@ exports[`ClayPagination renders 1`] = `
           aria-label="Go to the next page, 13"
           class="page-link"
           data-testid="nextArrow"
+          role="button"
           tabindex="0"
         >
           <svg