diff --git a/packages/react/src/components/DataTable/__tests__/TableToolbar-test.js b/packages/react/src/components/DataTable/__tests__/TableToolbar-test.js
index 5364f0b70b12..e2d3902dc9e3 100644
--- a/packages/react/src/components/DataTable/__tests__/TableToolbar-test.js
+++ b/packages/react/src/components/DataTable/__tests__/TableToolbar-test.js
@@ -6,12 +6,43 @@
  */
 
 import React from 'react';
-import { mount } from 'enzyme';
-import { TableToolbar } from '../';
+import TableToolbar from '../TableToolbar';
+import { render, screen } from '@testing-library/react';
 
-describe('DataTable.TableToolbar', () => {
-  it('should render', () => {
-    const wrapper = mount(<TableToolbar className="custom-class" />);
-    expect(wrapper).toMatchSnapshot();
+describe('TableToolbar', () => {
+  describe('renders as expected - Component API', () => {
+    it('should render', () => {
+      const { container } = render(<TableToolbar />);
+
+      expect(container).toMatchSnapshot();
+    });
+
+    it('should spread extra props onto outermost element', () => {
+      const { container } = render(<TableToolbar data-testid="test-id" />);
+
+      expect(container.firstChild).toHaveAttribute('data-testid', 'test-id');
+    });
+
+    it('should respect aria-label prop', () => {
+      render(<TableToolbar aria-label="Aria label" />);
+
+      expect(screen.getByLabelText('Aria label')).toBeInTheDocument();
+    });
+
+    it('should render children as expected', () => {
+      render(
+        <TableToolbar>
+          <div>child</div>
+        </TableToolbar>
+      );
+
+      expect(screen.getByText('child')).toBeInTheDocument();
+    });
+
+    it('should respect size prop', () => {
+      const { container } = render(<TableToolbar size="sm" />);
+
+      expect(container.firstChild).toHaveClass('cds--table-toolbar--sm');
+    });
   });
 });
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbar-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbar-test.js.snap
index 21f97627e2d0..5d5a930fe1e3 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbar-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbar-test.js.snap
@@ -1,13 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DataTable.TableToolbar should render 1`] = `
-<TableToolbar
-  aria-label="data table toolbar"
-  className="custom-class"
->
+exports[`TableToolbar renders as expected - Component API should render 1`] = `
+<div>
   <section
     aria-label="data table toolbar"
-    className="cds--table-toolbar"
+    class="cds--table-toolbar"
   />
-</TableToolbar>
+</div>
 `;