diff --git a/examples/Input.test.tsx b/examples/Input.test.tsx
index 99e40077c..22bf27827 100644
--- a/examples/Input.test.tsx
+++ b/examples/Input.test.tsx
@@ -13,7 +13,7 @@ function textbox() {
 }
 
 function gridcells() {
-  return screen.queryAllByRole("gridcell") as HTMLTableCellElement[];
+  return screen.queryAllByRole("cell") as HTMLTableCellElement[];
 }
 
 function selectedCells() {
diff --git a/examples/ModifiersHidden.test.tsx b/examples/ModifiersHidden.test.tsx
index a4f7b85ce..993a49840 100644
--- a/examples/ModifiersHidden.test.tsx
+++ b/examples/ModifiersHidden.test.tsx
@@ -18,6 +18,6 @@ afterAll(() => jest.useRealTimers());
 test.each(days)("the day %s should be hidden", (day) => {
   render(<ModifiersHidden />);
   expect(
-    screen.queryByRole("gridcell", { name: `${day.getDate()}` })
+    screen.queryByRole("cell", { name: `${day.getDate()}` })
   ).not.toBeInTheDocument();
 });
diff --git a/examples/Range.test.tsx b/examples/Range.test.tsx
index 40e3e5031..2a46c0334 100644
--- a/examples/Range.test.tsx
+++ b/examples/Range.test.tsx
@@ -61,7 +61,7 @@ describe("when a day in the range is clicked", () => {
 });
 
 function getAllSelected() {
-  const gridcells = screen.getAllByRole("gridcell");
+  const gridcells = screen.getAllByRole("cell");
 
   return Array.from(gridcells).filter(
     (gridcell) => gridcell.getAttribute("aria-selected") === "true"
diff --git a/examples/Weeknumber.test.tsx b/examples/Weeknumber.test.tsx
index abe7de811..26abe1f7e 100644
--- a/examples/Weeknumber.test.tsx
+++ b/examples/Weeknumber.test.tsx
@@ -9,7 +9,7 @@ const today = new Date(2021, 10, 25);
 beforeAll(() => jest.setSystemTime(today));
 afterAll(() => jest.useRealTimers());
 
-function getWeekButton(week: number) {
+function getWeek(week: number) {
   return screen.getByRole("rowheader", {
     name: `Week ${week}`
   });
@@ -19,6 +19,6 @@ beforeEach(() => render(<Weeknumber />).container);
 
 describe("when displaying November 2021", () => {
   test("should display the 45th week number", () => {
-    expect(getWeekButton(45)).toBeInTheDocument();
+    expect(getWeek(45)).toBeInTheDocument();
   });
 });
diff --git a/examples/WeeknumberCustom.tsx b/examples/WeeknumberCustom.tsx
index 065c3e96e..dbcd08f90 100644
--- a/examples/WeeknumberCustom.tsx
+++ b/examples/WeeknumberCustom.tsx
@@ -13,9 +13,9 @@ export function WeeknumberCustom() {
       defaultMonth={addMonths(today, -1)}
       components={{
         WeekNumber: ({ week, ...props }: WeekNumberProps) => (
-          <td {...props}>
+          <th {...props}>
             <button onClick={() => console.log(week)}>{props.children}</button>
-          </td>
+          </th>
         )
       }}
       labels={{
diff --git a/examples/__snapshots__/Range.test.tsx.snap b/examples/__snapshots__/Range.test.tsx.snap
index f6057b79e..7ae9c9c62 100644
--- a/examples/__snapshots__/Range.test.tsx.snap
+++ b/examples/__snapshots__/Range.test.tsx.snap
@@ -13,7 +13,6 @@ exports[`should match the snapshot 1`] = `
       <nav
         aria-label=""
         class="rdp-nav"
-        role="navigation"
       >
         <button
           aria-label="Go to the Previous Month"
@@ -71,54 +70,53 @@ exports[`should match the snapshot 1`] = `
           <thead>
             <tr
               class="rdp-weekdays"
-              role="row"
             >
               <th
                 aria-label="Sunday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Su
               </th>
               <th
                 aria-label="Monday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Mo
               </th>
               <th
                 aria-label="Tuesday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Tu
               </th>
               <th
                 aria-label="Wednesday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 We
               </th>
               <th
                 aria-label="Thursday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Th
               </th>
               <th
                 aria-label="Friday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Fr
               </th>
               <th
                 aria-label="Saturday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Sa
               </th>
@@ -126,11 +124,9 @@ exports[`should match the snapshot 1`] = `
           </thead>
           <tbody
             class="rdp-weeks"
-            role="rowgroup"
           >
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 aria-hidden="true"
@@ -139,12 +135,12 @@ exports[`should match the snapshot 1`] = `
                 data-hidden="true"
                 data-month="2020-05"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, May 31st, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   31
                 </button>
@@ -152,12 +148,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-01"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, June 1st, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   1
                 </button>
@@ -165,12 +161,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-02"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, June 2nd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   2
                 </button>
@@ -178,12 +174,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-03"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, June 3rd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   3
                 </button>
@@ -191,12 +187,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-04"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, June 4th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   4
                 </button>
@@ -204,12 +200,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-05"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, June 5th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   5
                 </button>
@@ -217,12 +213,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-06"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, June 6th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   6
                 </button>
@@ -230,17 +226,16 @@ exports[`should match the snapshot 1`] = `
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2020-06-07"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, June 7th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   7
                 </button>
@@ -248,12 +243,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-08"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, June 8th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   8
                 </button>
@@ -261,12 +256,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-09"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, June 9th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   9
                 </button>
@@ -274,12 +269,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-10"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, June 10th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   10
                 </button>
@@ -287,12 +282,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-11"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, June 11th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   11
                 </button>
@@ -300,12 +295,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-12"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, June 12th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   12
                 </button>
@@ -313,12 +308,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-13"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, June 13th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   13
                 </button>
@@ -326,17 +321,16 @@ exports[`should match the snapshot 1`] = `
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2020-06-14"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, June 14th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   14
                 </button>
@@ -346,12 +340,12 @@ exports[`should match the snapshot 1`] = `
                 class="rdp-day rdp-range_start rdp-selected"
                 data-day="2020-06-15"
                 data-selected="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, June 15th, 2020, selected"
                   class="rdp-day_button"
                   tabindex="0"
+                  type="button"
                 >
                   15
                 </button>
@@ -361,12 +355,12 @@ exports[`should match the snapshot 1`] = `
                 class="rdp-day rdp-range_middle rdp-selected"
                 data-day="2020-06-16"
                 data-selected="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, June 16th, 2020, selected"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   16
                 </button>
@@ -376,12 +370,12 @@ exports[`should match the snapshot 1`] = `
                 class="rdp-day rdp-range_middle rdp-selected"
                 data-day="2020-06-17"
                 data-selected="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, June 17th, 2020, selected"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   17
                 </button>
@@ -391,12 +385,12 @@ exports[`should match the snapshot 1`] = `
                 class="rdp-day rdp-range_middle rdp-selected"
                 data-day="2020-06-18"
                 data-selected="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, June 18th, 2020, selected"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   18
                 </button>
@@ -406,12 +400,12 @@ exports[`should match the snapshot 1`] = `
                 class="rdp-day rdp-range_end rdp-selected"
                 data-day="2020-06-19"
                 data-selected="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, June 19th, 2020, selected"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   19
                 </button>
@@ -419,12 +413,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-20"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, June 20th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   20
                 </button>
@@ -432,17 +426,16 @@ exports[`should match the snapshot 1`] = `
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2020-06-21"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, June 21st, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   21
                 </button>
@@ -450,12 +443,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-22"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, June 22nd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   22
                 </button>
@@ -463,12 +456,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-23"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, June 23rd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   23
                 </button>
@@ -476,12 +469,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-24"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, June 24th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   24
                 </button>
@@ -489,12 +482,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-25"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, June 25th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   25
                 </button>
@@ -502,12 +495,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-26"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, June 26th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   26
                 </button>
@@ -515,12 +508,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-27"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, June 27th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   27
                 </button>
@@ -528,17 +521,16 @@ exports[`should match the snapshot 1`] = `
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2020-06-28"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, June 28th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   28
                 </button>
@@ -546,12 +538,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-29"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, June 29th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   29
                 </button>
@@ -559,12 +551,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2020-06-30"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, June 30th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   30
                 </button>
@@ -576,12 +568,12 @@ exports[`should match the snapshot 1`] = `
                 data-hidden="true"
                 data-month="2020-07"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, July 1st, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   1
                 </button>
@@ -593,12 +585,12 @@ exports[`should match the snapshot 1`] = `
                 data-hidden="true"
                 data-month="2020-07"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, July 2nd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   2
                 </button>
@@ -610,12 +602,12 @@ exports[`should match the snapshot 1`] = `
                 data-hidden="true"
                 data-month="2020-07"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, July 3rd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   3
                 </button>
@@ -627,12 +619,12 @@ exports[`should match the snapshot 1`] = `
                 data-hidden="true"
                 data-month="2020-07"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, July 4th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   4
                 </button>
@@ -666,7 +658,6 @@ exports[`when a day in the range is clicked when the day is clicked again when a
       <nav
         aria-label=""
         class="rdp-nav"
-        role="navigation"
       >
         <button
           aria-label="Go to the Previous Month"
@@ -724,54 +715,53 @@ exports[`when a day in the range is clicked when the day is clicked again when a
           <thead>
             <tr
               class="rdp-weekdays"
-              role="row"
             >
               <th
                 aria-label="Sunday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Su
               </th>
               <th
                 aria-label="Monday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Mo
               </th>
               <th
                 aria-label="Tuesday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Tu
               </th>
               <th
                 aria-label="Wednesday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 We
               </th>
               <th
                 aria-label="Thursday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Th
               </th>
               <th
                 aria-label="Friday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Fr
               </th>
               <th
                 aria-label="Saturday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Sa
               </th>
@@ -779,11 +769,9 @@ exports[`when a day in the range is clicked when the day is clicked again when a
           </thead>
           <tbody
             class="rdp-weeks"
-            role="rowgroup"
           >
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 aria-hidden="true"
@@ -792,12 +780,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
                 data-hidden="true"
                 data-month="2020-05"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, May 31st, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   31
                 </button>
@@ -805,12 +793,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-01"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, June 1st, 2020"
                   class="rdp-day_button"
                   tabindex="0"
+                  type="button"
                 >
                   1
                 </button>
@@ -818,12 +806,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-02"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, June 2nd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   2
                 </button>
@@ -831,12 +819,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-03"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, June 3rd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   3
                 </button>
@@ -844,12 +832,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-04"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, June 4th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   4
                 </button>
@@ -857,12 +845,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-05"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, June 5th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   5
                 </button>
@@ -870,12 +858,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-06"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, June 6th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   6
                 </button>
@@ -883,17 +871,16 @@ exports[`when a day in the range is clicked when the day is clicked again when a
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2020-06-07"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, June 7th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   7
                 </button>
@@ -901,12 +888,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-08"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, June 8th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   8
                 </button>
@@ -914,12 +901,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-09"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, June 9th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   9
                 </button>
@@ -927,12 +914,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-10"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, June 10th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   10
                 </button>
@@ -940,12 +927,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-11"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, June 11th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   11
                 </button>
@@ -953,12 +940,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-12"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, June 12th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   12
                 </button>
@@ -966,12 +953,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-13"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, June 13th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   13
                 </button>
@@ -979,17 +966,16 @@ exports[`when a day in the range is clicked when the day is clicked again when a
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2020-06-14"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, June 14th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   14
                 </button>
@@ -997,12 +983,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-15"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, June 15th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   15
                 </button>
@@ -1010,12 +996,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-16"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, June 16th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   16
                 </button>
@@ -1024,12 +1010,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
                 class="rdp-day rdp-focused"
                 data-day="2020-06-17"
                 data-focused="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, June 17th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   17
                 </button>
@@ -1037,12 +1023,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-18"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, June 18th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   18
                 </button>
@@ -1050,12 +1036,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-19"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, June 19th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   19
                 </button>
@@ -1063,12 +1049,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-20"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, June 20th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   20
                 </button>
@@ -1076,17 +1062,16 @@ exports[`when a day in the range is clicked when the day is clicked again when a
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2020-06-21"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, June 21st, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   21
                 </button>
@@ -1094,12 +1079,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-22"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, June 22nd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   22
                 </button>
@@ -1107,12 +1092,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-23"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, June 23rd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   23
                 </button>
@@ -1120,12 +1105,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-24"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, June 24th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   24
                 </button>
@@ -1133,12 +1118,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-25"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, June 25th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   25
                 </button>
@@ -1146,12 +1131,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-26"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, June 26th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   26
                 </button>
@@ -1159,12 +1144,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-27"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, June 27th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   27
                 </button>
@@ -1172,17 +1157,16 @@ exports[`when a day in the range is clicked when the day is clicked again when a
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2020-06-28"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, June 28th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   28
                 </button>
@@ -1190,12 +1174,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-29"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, June 29th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   29
                 </button>
@@ -1203,12 +1187,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
               <td
                 class="rdp-day"
                 data-day="2020-06-30"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, June 30th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   30
                 </button>
@@ -1220,12 +1204,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
                 data-hidden="true"
                 data-month="2020-07"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, July 1st, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   1
                 </button>
@@ -1237,12 +1221,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
                 data-hidden="true"
                 data-month="2020-07"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, July 2nd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   2
                 </button>
@@ -1254,12 +1238,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
                 data-hidden="true"
                 data-month="2020-07"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, July 3rd, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   3
                 </button>
@@ -1271,12 +1255,12 @@ exports[`when a day in the range is clicked when the day is clicked again when a
                 data-hidden="true"
                 data-month="2020-07"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, July 4th, 2020"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   4
                 </button>
diff --git a/examples/__snapshots__/StylingCssModules.test.tsx.snap b/examples/__snapshots__/StylingCssModules.test.tsx.snap
index f4e612d26..c1ee32318 100644
--- a/examples/__snapshots__/StylingCssModules.test.tsx.snap
+++ b/examples/__snapshots__/StylingCssModules.test.tsx.snap
@@ -14,7 +14,6 @@ exports[`should match the snapshot 1`] = `
       <nav
         aria-label=""
         class="rdp-nav"
-        role="navigation"
       >
         <button
           aria-label="Go to the Previous Month"
@@ -72,54 +71,53 @@ exports[`should match the snapshot 1`] = `
           <thead>
             <tr
               class="rdp-weekdays"
-              role="row"
             >
               <th
                 aria-label="Sunday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Su
               </th>
               <th
                 aria-label="Monday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Mo
               </th>
               <th
                 aria-label="Tuesday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Tu
               </th>
               <th
                 aria-label="Wednesday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 We
               </th>
               <th
                 aria-label="Thursday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Th
               </th>
               <th
                 aria-label="Friday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Fr
               </th>
               <th
                 aria-label="Saturday"
                 class="rdp-weekday"
-                role="columnheader"
+                scope="col"
               >
                 Sa
               </th>
@@ -127,11 +125,9 @@ exports[`should match the snapshot 1`] = `
           </thead>
           <tbody
             class="rdp-weeks"
-            role="rowgroup"
           >
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 aria-hidden="true"
@@ -140,12 +136,12 @@ exports[`should match the snapshot 1`] = `
                 data-hidden="true"
                 data-month="2021-10"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, October 31st, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   31
                 </button>
@@ -153,12 +149,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-01"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, November 1st, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   1
                 </button>
@@ -166,12 +162,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-02"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, November 2nd, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   2
                 </button>
@@ -179,12 +175,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-03"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, November 3rd, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   3
                 </button>
@@ -192,12 +188,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-04"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, November 4th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   4
                 </button>
@@ -205,12 +201,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-05"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, November 5th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   5
                 </button>
@@ -218,12 +214,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-06"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, November 6th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   6
                 </button>
@@ -231,17 +227,16 @@ exports[`should match the snapshot 1`] = `
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2021-11-07"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, November 7th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   7
                 </button>
@@ -249,12 +244,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-08"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, November 8th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   8
                 </button>
@@ -262,12 +257,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-09"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, November 9th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   9
                 </button>
@@ -275,12 +270,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-10"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, November 10th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   10
                 </button>
@@ -288,12 +283,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-11"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, November 11th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   11
                 </button>
@@ -301,12 +296,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-12"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, November 12th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   12
                 </button>
@@ -314,12 +309,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-13"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, November 13th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   13
                 </button>
@@ -327,17 +322,16 @@ exports[`should match the snapshot 1`] = `
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2021-11-14"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, November 14th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   14
                 </button>
@@ -345,12 +339,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-15"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, November 15th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   15
                 </button>
@@ -358,12 +352,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-16"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, November 16th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   16
                 </button>
@@ -371,12 +365,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-17"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, November 17th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   17
                 </button>
@@ -384,12 +378,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-18"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, November 18th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   18
                 </button>
@@ -397,12 +391,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-19"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, November 19th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   19
                 </button>
@@ -410,12 +404,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-20"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, November 20th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   20
                 </button>
@@ -423,17 +417,16 @@ exports[`should match the snapshot 1`] = `
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2021-11-21"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, November 21st, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   21
                 </button>
@@ -441,12 +434,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-22"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, November 22nd, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   22
                 </button>
@@ -454,12 +447,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-23"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, November 23rd, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   23
                 </button>
@@ -467,12 +460,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-24"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, November 24th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   24
                 </button>
@@ -481,12 +474,12 @@ exports[`should match the snapshot 1`] = `
                 class="rdp-day rdp-today"
                 data-day="2021-11-25"
                 data-today="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Today, Thursday, November 25th, 2021"
                   class="rdp-day_button"
                   tabindex="0"
+                  type="button"
                 >
                   25
                 </button>
@@ -494,12 +487,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-26"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, November 26th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   26
                 </button>
@@ -507,12 +500,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-27"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, November 27th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   27
                 </button>
@@ -520,17 +513,16 @@ exports[`should match the snapshot 1`] = `
             </tr>
             <tr
               class="rdp-week"
-              role="row"
             >
               <td
                 class="rdp-day"
                 data-day="2021-11-28"
-                role="gridcell"
               >
                 <button
                   aria-label="Sunday, November 28th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   28
                 </button>
@@ -538,12 +530,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-29"
-                role="gridcell"
               >
                 <button
                   aria-label="Monday, November 29th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   29
                 </button>
@@ -551,12 +543,12 @@ exports[`should match the snapshot 1`] = `
               <td
                 class="rdp-day"
                 data-day="2021-11-30"
-                role="gridcell"
               >
                 <button
                   aria-label="Tuesday, November 30th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   30
                 </button>
@@ -568,12 +560,12 @@ exports[`should match the snapshot 1`] = `
                 data-hidden="true"
                 data-month="2021-12"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Wednesday, December 1st, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   1
                 </button>
@@ -585,12 +577,12 @@ exports[`should match the snapshot 1`] = `
                 data-hidden="true"
                 data-month="2021-12"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Thursday, December 2nd, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   2
                 </button>
@@ -602,12 +594,12 @@ exports[`should match the snapshot 1`] = `
                 data-hidden="true"
                 data-month="2021-12"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Friday, December 3rd, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   3
                 </button>
@@ -619,12 +611,12 @@ exports[`should match the snapshot 1`] = `
                 data-hidden="true"
                 data-month="2021-12"
                 data-outside="true"
-                role="gridcell"
               >
                 <button
                   aria-label="Saturday, December 4th, 2021"
                   class="rdp-day_button"
                   tabindex="-1"
+                  type="button"
                 >
                   4
                 </button>
diff --git a/package.json b/package.json
index 498cbaa2c..59ce78064 100644
--- a/package.json
+++ b/package.json
@@ -144,8 +144,8 @@
     "tsconfig.json"
   ],
   "dependencies": {
-    "date-fns": "^4.1.0",
-    "@date-fns/tz": "^1.0.2"
+    "@date-fns/tz": "^1.0.2",
+    "date-fns": "^4.1.0"
   },
   "devDependencies": {
     "@date-fns/utc": "^2.1.0",
@@ -173,6 +173,7 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-require-extensions": "^0.1.3",
     "eslint-plugin-testing-library": "^6.3.0",
+    "html-validate": "^8.22.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "mockdate": "^3.0.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8d7dcbf21..51160efd2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -87,6 +87,9 @@ importers:
       eslint-plugin-testing-library:
         specifier: ^6.3.0
         version: 6.3.0(eslint@8.57.0)(typescript@5.5.4)
+      html-validate:
+        specifier: ^8.22.0
+        version: 8.22.0(jest-diff@29.7.0)(jest-snapshot@29.7.0)(jest@29.7.0(@types/node@22.5.4)(ts-node@10.9.2(@types/node@22.5.4)(typescript@5.5.4)))
       jest:
         specifier: ^29.7.0
         version: 29.7.0(@types/node@22.5.4)(ts-node@10.9.2(@types/node@22.5.4)(typescript@5.5.4))
@@ -1358,6 +1361,10 @@ packages:
   '@hapi/topo@5.1.0':
     resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==}
 
+  '@html-validate/stylish@4.2.0':
+    resolution: {integrity: sha512-Nl8HCv0hGRSLQ+n1OD4Hk3a+Urwk9HH0vQkAzzCarT4KlA7bRl+6xEiS5PZVwOmjtC7XiH/oNe3as9Fxcr2A1w==}
+    engines: {node: '>= 16'}
+
   '@humanwhocodes/config-array@0.11.14':
     resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
     engines: {node: '>=10.10.0'}
@@ -1371,6 +1378,10 @@ packages:
     resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
     deprecated: Use @eslint/object-schema instead
 
+  '@isaacs/cliui@8.0.2':
+    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
+    engines: {node: '>=12'}
+
   '@istanbuljs/load-nyc-config@1.1.0':
     resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
     engines: {node: '>=8'}
@@ -1497,6 +1508,10 @@ packages:
     resolution: {integrity: sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==}
     engines: {node: '>=12.4.0'}
 
+  '@pkgjs/parseargs@0.11.0':
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    engines: {node: '>=14'}
+
   '@pkgr/core@0.1.1':
     resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
@@ -1614,6 +1629,12 @@ packages:
   '@sideway/pinpoint@2.0.0':
     resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==}
 
+  '@sidvind/better-ajv-errors@3.0.1':
+    resolution: {integrity: sha512-++1mEYIeozfnwWI9P1ECvOPoacy+CgDASrmGvXPMCcqgx0YUzB01vZ78uHdQ443V6sTY+e9MzHqmN9DOls02aw==}
+    engines: {node: '>= 16.14'}
+    peerDependencies:
+      ajv: ^6.12.3 || ^7.0.0 || ^8.0.0
+
   '@sinclair/typebox@0.27.8':
     resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
 
@@ -3597,6 +3618,10 @@ packages:
   for-each@0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
 
+  foreground-child@3.3.0:
+    resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
+    engines: {node: '>=14'}
+
   fork-ts-checker-webpack-plugin@6.5.3:
     resolution: {integrity: sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==}
     engines: {node: '>=10', yarn: '>=1.0.0'}
@@ -3707,6 +3732,10 @@ packages:
   glob-to-regexp@0.4.1:
     resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
 
+  glob@10.4.5:
+    resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
+    hasBin: true
+
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     deprecated: Glob versions prior to v9 are no longer supported
@@ -3868,6 +3897,25 @@ packages:
     resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
     engines: {node: '>=8'}
 
+  html-validate@8.22.0:
+    resolution: {integrity: sha512-kKDnU04zdxQIOSZVD6BKma6gWpCMCCFwYvHWwTorBMVbSYXMW1B5kGgLwOMHzTlC3yiuaO7NvJprXk3w7Jko/Q==}
+    engines: {node: '>= 16.14'}
+    hasBin: true
+    peerDependencies:
+      jest: ^27.1 || ^28.1.3 || ^29.0.3
+      jest-diff: ^27.1 || ^28.1.3 || ^29.0.3
+      jest-snapshot: ^27.1 || ^28.1.3 || ^29.0.3
+      vitest: ^0.34 || ^1
+    peerDependenciesMeta:
+      jest:
+        optional: true
+      jest-diff:
+        optional: true
+      jest-snapshot:
+        optional: true
+      vitest:
+        optional: true
+
   html-void-elements@3.0.0:
     resolution: {integrity: sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==}
 
@@ -3957,6 +4005,10 @@ packages:
     resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}
     engines: {node: '>= 4'}
 
+  ignore@5.3.2:
+    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
+    engines: {node: '>= 4'}
+
   image-size@1.1.1:
     resolution: {integrity: sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ==}
     engines: {node: '>=16.x'}
@@ -4284,6 +4336,9 @@ packages:
   iterator.prototype@1.1.2:
     resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==}
 
+  jackspeak@3.4.3:
+    resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
+
   jake@10.9.1:
     resolution: {integrity: sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==}
     engines: {node: '>=10'}
@@ -4512,6 +4567,10 @@ packages:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
 
+  kleur@4.1.5:
+    resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
+    engines: {node: '>=6'}
+
   latest-version@7.0.0:
     resolution: {integrity: sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==}
     engines: {node: '>=14.16'}
@@ -4594,6 +4653,9 @@ packages:
     resolution: {integrity: sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  lru-cache@10.4.3:
+    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
+
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
@@ -4897,6 +4959,10 @@ packages:
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
+  minipass@7.1.2:
+    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
   mockdate@3.0.5:
     resolution: {integrity: sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==}
 
@@ -5084,6 +5150,9 @@ packages:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
 
+  package-json-from-dist@1.0.0:
+    resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==}
+
   package-json@8.1.1:
     resolution: {integrity: sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==}
     engines: {node: '>=14.16'}
@@ -5144,6 +5213,10 @@ packages:
   path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
+  path-scurry@1.11.1:
+    resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
+    engines: {node: '>=16 || 14 >=14.18'}
+
   path-to-regexp@0.1.7:
     resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
 
@@ -5950,6 +6023,10 @@ packages:
   signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
+  signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
+
   sirv@2.0.4:
     resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==}
     engines: {node: '>= 10'}
@@ -8599,6 +8676,10 @@ snapshots:
     dependencies:
       '@hapi/hoek': 9.3.0
 
+  '@html-validate/stylish@4.2.0':
+    dependencies:
+      kleur: 4.1.5
+
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
@@ -8611,6 +8692,15 @@ snapshots:
 
   '@humanwhocodes/object-schema@2.0.3': {}
 
+  '@isaacs/cliui@8.0.2':
+    dependencies:
+      string-width: 5.1.2
+      string-width-cjs: string-width@4.2.3
+      strip-ansi: 7.1.0
+      strip-ansi-cjs: strip-ansi@6.0.1
+      wrap-ansi: 8.1.0
+      wrap-ansi-cjs: wrap-ansi@7.0.0
+
   '@istanbuljs/load-nyc-config@1.1.0':
     dependencies:
       camelcase: 5.3.1
@@ -8860,6 +8950,9 @@ snapshots:
 
   '@nolyfill/is-core-module@1.0.39': {}
 
+  '@pkgjs/parseargs@0.11.0':
+    optional: true
+
   '@pkgr/core@0.1.1': {}
 
   '@pnpm/config.env-replace@1.1.0': {}
@@ -8941,6 +9034,11 @@ snapshots:
 
   '@sideway/pinpoint@2.0.0': {}
 
+  '@sidvind/better-ajv-errors@3.0.1(ajv@8.16.0)':
+    dependencies:
+      ajv: 8.16.0
+      kleur: 4.1.5
+
   '@sinclair/typebox@0.27.8': {}
 
   '@sindresorhus/is@4.6.0': {}
@@ -11396,6 +11494,11 @@ snapshots:
     dependencies:
       is-callable: 1.2.7
 
+  foreground-child@3.3.0:
+    dependencies:
+      cross-spawn: 7.0.3
+      signal-exit: 4.1.0
+
   fork-ts-checker-webpack-plugin@6.5.3(eslint@8.57.0)(typescript@5.5.4)(webpack@5.92.1):
     dependencies:
       '@babel/code-frame': 7.24.7
@@ -11503,6 +11606,15 @@ snapshots:
 
   glob-to-regexp@0.4.1: {}
 
+  glob@10.4.5:
+    dependencies:
+      foreground-child: 3.3.0
+      jackspeak: 3.4.3
+      minimatch: 9.0.5
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.0
+      path-scurry: 1.11.1
+
   glob@7.2.3:
     dependencies:
       fs.realpath: 1.0.0
@@ -11763,6 +11875,23 @@ snapshots:
 
   html-tags@3.3.1: {}
 
+  html-validate@8.22.0(jest-diff@29.7.0)(jest-snapshot@29.7.0)(jest@29.7.0(@types/node@22.5.4)(ts-node@10.9.2(@types/node@22.5.4)(typescript@5.5.4))):
+    dependencies:
+      '@html-validate/stylish': 4.2.0
+      '@sidvind/better-ajv-errors': 3.0.1(ajv@8.16.0)
+      ajv: 8.16.0
+      deepmerge: 4.3.1
+      glob: 10.4.5
+      ignore: 5.3.2
+      kleur: 4.1.5
+      minimist: 1.2.8
+      prompts: 2.4.2
+      semver: 7.6.3
+    optionalDependencies:
+      jest: 29.7.0(@types/node@22.5.4)(ts-node@10.9.2(@types/node@22.5.4)(typescript@5.5.4))
+      jest-diff: 29.7.0
+      jest-snapshot: 29.7.0
+
   html-void-elements@3.0.0: {}
 
   html-webpack-plugin@5.6.0(webpack@5.92.1):
@@ -11870,6 +11999,8 @@ snapshots:
 
   ignore@5.3.1: {}
 
+  ignore@5.3.2: {}
+
   image-size@1.1.1:
     dependencies:
       queue: 6.0.2
@@ -12156,6 +12287,12 @@ snapshots:
       reflect.getprototypeof: 1.0.6
       set-function-name: 2.0.2
 
+  jackspeak@3.4.3:
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+
   jake@10.9.1:
     dependencies:
       async: 3.2.5
@@ -12590,6 +12727,8 @@ snapshots:
 
   kleur@3.0.3: {}
 
+  kleur@4.1.5: {}
+
   latest-version@7.0.0:
     dependencies:
       package-json: 8.1.1
@@ -12663,6 +12802,8 @@ snapshots:
 
   lowercase-keys@3.0.0: {}
 
+  lru-cache@10.4.3: {}
+
   lru-cache@5.1.1:
     dependencies:
       yallist: 3.1.1
@@ -13245,6 +13386,8 @@ snapshots:
 
   minimist@1.2.8: {}
 
+  minipass@7.1.2: {}
+
   mockdate@3.0.5: {}
 
   mrmime@2.0.0: {}
@@ -13418,6 +13561,8 @@ snapshots:
 
   p-try@2.2.0: {}
 
+  package-json-from-dist@1.0.0: {}
+
   package-json@8.1.1:
     dependencies:
       got: 12.6.1
@@ -13484,6 +13629,11 @@ snapshots:
 
   path-parse@1.0.7: {}
 
+  path-scurry@1.11.1:
+    dependencies:
+      lru-cache: 10.4.3
+      minipass: 7.1.2
+
   path-to-regexp@0.1.7: {}
 
   path-to-regexp@1.8.0:
@@ -14566,6 +14716,8 @@ snapshots:
 
   signal-exit@3.0.7: {}
 
+  signal-exit@4.1.0: {}
+
   sirv@2.0.4:
     dependencies:
       '@polka/url': 1.0.0-next.25
diff --git a/src/DayPicker.test.tsx b/src/DayPicker.test.tsx
index 0c7c19480..8a29018bd 100644
--- a/src/DayPicker.test.tsx
+++ b/src/DayPicker.test.tsx
@@ -180,3 +180,16 @@ test("should render the custom components", () => {
   expect(screen.getByText("Custom YearsDropdown")).toBeInTheDocument();
   expect(screen.getByText("Custom MonthsDropdown")).toBeInTheDocument();
 });
+
+describe("when interactive", () => {
+  test("render a valid HTML", () => {
+    render(<DayPicker mode="single" />);
+    expect(document.body).toHTMLValidate();
+  });
+});
+describe("when not interactive", () => {
+  test("render a valid HTML", () => {
+    render(<DayPicker />);
+    expect(document.body).toHTMLValidate();
+  });
+});
diff --git a/src/DayPicker.tsx b/src/DayPicker.tsx
index cc32d10ad..2f54520db 100644
--- a/src/DayPicker.tsx
+++ b/src/DayPicker.tsx
@@ -279,7 +279,6 @@ export function DayPicker(props: DayPickerProps) {
         >
           {!props.hideNavigation && (
             <components.Nav
-              role="navigation"
               className={classNames[UI.Nav]}
               style={styles?.[UI.Nav]}
               aria-label={labelNav()}
@@ -413,15 +412,14 @@ export function DayPicker(props: DayPickerProps) {
                   {!props.hideWeekdays && (
                     <components.Weekdays
                       className={classNames[UI.Weekdays]}
-                      role="row"
                       style={styles?.[UI.Weekdays]}
                     >
                       {showWeekNumber && (
                         <components.WeekNumberHeader
                           aria-label={labelWeekNumberHeader(labelOptions)}
                           className={classNames[UI.WeekNumberHeader]}
-                          role="columnheader"
                           style={styles?.[UI.WeekNumberHeader]}
+                          scope="col"
                         >
                           {formatWeekNumberHeader()}
                         </components.WeekNumberHeader>
@@ -435,8 +433,8 @@ export function DayPicker(props: DayPickerProps) {
                           )}
                           className={classNames[UI.Weekday]}
                           key={i}
-                          role="columnheader"
                           style={styles?.[UI.Weekday]}
+                          scope="col"
                         >
                           {formatWeekdayName(weekday, formatOptions, dateLib)}
                         </components.Weekday>
@@ -445,7 +443,6 @@ export function DayPicker(props: DayPickerProps) {
                   )}
                   <components.Weeks
                     className={classNames[UI.Weeks]}
-                    role="rowgroup"
                     style={styles?.[UI.Weeks]}
                   >
                     {calendarMonth.weeks.map((week, weekIndex) => {
@@ -453,19 +450,18 @@ export function DayPicker(props: DayPickerProps) {
                         <components.Week
                           className={classNames[UI.Week]}
                           key={week.weekNumber}
-                          role="row"
                           style={styles?.[UI.Week]}
                           week={week}
                         >
                           {showWeekNumber && (
                             <components.WeekNumber
                               week={week}
-                              role="rowheader"
                               style={styles?.[UI.WeekNumber]}
                               aria-label={labelWeekNumber(week.weekNumber, {
                                 locale
                               })}
                               className={classNames[UI.WeekNumber]}
+                              scope="row"
                             >
                               {formatWeekNumber(week.weekNumber)}
                             </components.WeekNumber>
@@ -526,7 +522,6 @@ export function DayPicker(props: DayPickerProps) {
                                 key={`${dateLib.format(date, "yyyy-MM-dd")}_${dateLib.format(day.displayMonth, "yyyy-MM")}`}
                                 day={day}
                                 modifiers={modifiers}
-                                role="gridcell"
                                 className={className.join(" ")}
                                 style={style}
                                 aria-hidden={modifiers.hidden || undefined}
@@ -549,6 +544,7 @@ export function DayPicker(props: DayPickerProps) {
                                   <components.DayButton
                                     className={classNames[UI.DayButton]}
                                     style={styles?.[UI.DayButton]}
+                                    type="button"
                                     day={day}
                                     modifiers={modifiers}
                                     disabled={modifiers.disabled || undefined}
diff --git a/src/components/WeekNumber.tsx b/src/components/WeekNumber.tsx
index 1cd68c76e..b211f6f33 100644
--- a/src/components/WeekNumber.tsx
+++ b/src/components/WeekNumber.tsx
@@ -12,10 +12,10 @@ export function WeekNumber(
   props: {
     /** The week to render. */
     week: CalendarWeek;
-  } & JSX.IntrinsicElements["td"]
+  } & JSX.IntrinsicElements["th"]
 ) {
-  const { week, ...tdProps } = props;
-  return <td {...tdProps} />;
+  const { week, ...thProps } = props;
+  return <th {...thProps} />;
 }
 
 export type WeekNumberProps = Parameters<typeof WeekNumber>[0];
diff --git a/test/elements.ts b/test/elements.ts
index 438fcae70..8af331e0d 100644
--- a/test/elements.ts
+++ b/test/elements.ts
@@ -83,10 +83,10 @@ export function dateButton(date: Date) {
  */
 export function gridcell(date: Date, interactive?: boolean) {
   if (interactive)
-    return screen.getByRole("gridcell", {
+    return screen.getByRole("cell", {
       name: date.getDate().toString()
     });
-  return screen.getByRole("gridcell", {
+  return screen.getByRole("cell", {
     name: labelGridcell(date)
   });
 }
diff --git a/test/setup.ts b/test/setup.ts
index 75ddf97b0..2bd1c2179 100644
--- a/test/setup.ts
+++ b/test/setup.ts
@@ -1,5 +1,6 @@
 import { configure } from "@testing-library/dom";
 import "@testing-library/jest-dom";
+import "html-validate/jest";
 
 import "./dateMatchers";