diff --git a/src/components/GradesView/EditModal/OverrideTable/__snapshots__/test.jsx.snap b/src/components/GradesView/EditModal/OverrideTable/__snapshots__/test.jsx.snap
index 998cdd9c..1f1169b8 100644
--- a/src/components/GradesView/EditModal/OverrideTable/__snapshots__/test.jsx.snap
+++ b/src/components/GradesView/EditModal/OverrideTable/__snapshots__/test.jsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`OverrideTable Component snapshots basic snapshot shows a row for each entry and one editable row 1`] = `
-<Component
+<DataTable
   columns={
     Array [
       Object {
@@ -59,5 +59,6 @@ exports[`OverrideTable Component snapshots basic snapshot shows a row for each e
       },
     ]
   }
+  itemCount={2}
 />
 `;
diff --git a/src/components/GradesView/EditModal/OverrideTable/test.jsx b/src/components/GradesView/EditModal/OverrideTable/test.jsx
index c4594400..96149b47 100644
--- a/src/components/GradesView/EditModal/OverrideTable/test.jsx
+++ b/src/components/GradesView/EditModal/OverrideTable/test.jsx
@@ -8,7 +8,7 @@ import {
   mapStateToProps,
 } from '.';
 
-jest.mock('@edx/paragon', () => ({ Table: () => 'Table' }));
+jest.mock('@edx/paragon', () => ({ DataTable: () => 'DataTable' }));
 jest.mock('./ReasonInput', () => 'ReasonInput');
 jest.mock('./AdjustedGradeInput', () => 'AdjustedGradeInput');
 
diff --git a/src/components/GradesView/GradebookTable/__snapshots__/test.jsx.snap b/src/components/GradesView/GradebookTable/__snapshots__/test.jsx.snap
index c6899cf6..cd4bb27b 100644
--- a/src/components/GradesView/GradebookTable/__snapshots__/test.jsx.snap
+++ b/src/components/GradesView/GradebookTable/__snapshots__/test.jsx.snap
@@ -4,78 +4,45 @@ exports[`GradebookTable component snapshot - fields1 and 2 between email and tot
 <div
   className="gradebook-container"
 >
-  <div
-    className="gbook"
-  >
-    <DataTable
-      EmptyTableComponent={[Function]}
-      FilterStatusComponent={[Function]}
-      RowStatusComponent={[Function]}
-      SelectionStatusComponent={[Function]}
-      additionalColumns={Array []}
-      bulkActions={Array []}
-      columns={
-        Array [
-          Object {
-            "Header": <UsernameLabelReplacement />,
-            "accessor": "Username",
-          },
-          Object {
-            "Header": <FormattedMessage
-              defaultMessage="Email"
-              description="Gradebook table email column header"
-              id="gradebook.GradesView.table.headings.email"
-            />,
-            "accessor": "Email",
-          },
-          Object {
-            "Header": "field1",
-            "accessor": "field1",
-          },
-          Object {
-            "Header": "field2",
-            "accessor": "field2",
-          },
-          Object {
-            "Header": <TotalGradeLabelReplacement />,
-            "accessor": "Total Grade (%)",
-          },
-        ]
-      }
-      data={
-        Array [
-          "mappedRow: 1",
-          "mappedRow: 2",
-          "mappedRow: 3",
-        ]
-      }
-      dataViewToggleOptions={
+  <DataTable
+    columns={
+      Array [
         Object {
-          "defaultActiveStateValue": "card",
-          "isDataViewToggleEnabled": false,
-          "onDataViewToggle": [Function],
-          "togglePlacement": "left",
-        }
-      }
-      defaultColumnValues={Object {}}
-      fetchData={null}
-      hasFixedColumnWidths={true}
-      initialState={Object {}}
-      initialTableOptions={Object {}}
-      isExpandable={false}
-      isFilterable={false}
-      isLoading={false}
-      isPaginated={false}
-      isSelectable={false}
-      isSortable={false}
-      manualFilters={false}
-      manualPagination={false}
-      manualSortBy={false}
-      numBreakoutFilters={1}
-      rowHeaderColumnKey="username"
-      showFiltersInSidebar={false}
-      tableActions={Array []}
-    />
-  </div>
+          "Header": <UsernameLabelReplacement />,
+          "accessor": "Username",
+        },
+        Object {
+          "Header": <FormattedMessage
+            defaultMessage="Email"
+            description="Gradebook table email column header"
+            id="gradebook.GradesView.table.headings.email"
+          />,
+          "accessor": "Email",
+        },
+        Object {
+          "Header": "field1",
+          "accessor": "field1",
+        },
+        Object {
+          "Header": "field2",
+          "accessor": "field2",
+        },
+        Object {
+          "Header": <TotalGradeLabelReplacement />,
+          "accessor": "Total Grade (%)",
+        },
+      ]
+    }
+    data={
+      Array [
+        "mappedRow: 1",
+        "mappedRow: 2",
+        "mappedRow: 3",
+      ]
+    }
+    hasFixedColumnWidths={true}
+    itemCount={3}
+    rowHeaderColumnKey="username"
+  />
 </div>
 `;
diff --git a/src/components/GradesView/GradebookTable/test.jsx b/src/components/GradesView/GradebookTable/test.jsx
index 2839b6bc..0d821585 100644
--- a/src/components/GradesView/GradebookTable/test.jsx
+++ b/src/components/GradesView/GradebookTable/test.jsx
@@ -11,6 +11,7 @@ import Fields from './Fields';
 import messages from './messages';
 import { GradebookTable, mapStateToProps } from '.';
 
+jest.mock('@edx/paragon', () => ({ DataTable: () => 'DataTable' }));
 jest.mock('./Fields', () => ({
   __esModule: true,
   default: {