diff --git a/test/unit/components/button-click.test.jsx b/test/unit/components/button-click.test.jsx
new file mode 100644
index 00000000..da26198b
--- /dev/null
+++ b/test/unit/components/button-click.test.jsx
@@ -0,0 +1,17 @@
+/* eslint-env jest */
+import React from 'react'; // eslint-disable-line no-unused-vars
+import {shallow} from 'enzyme';
+import Button from '../../../src/components/button/button.jsx'; // eslint-disable-line no-unused-vars, max-len
+
+describe('Button', () => {
+    test('triggers callback when clicked', () => {
+        const onClick = jest.fn();
+        const componentShallowWrapper = shallow(
+            <Button onClick={onClick}>
+                {'Button'}
+            </Button>
+        );
+        componentShallowWrapper.simulate('click');
+        expect(onClick).toHaveBeenCalled();
+    });
+});
diff --git a/test/unit/components/tool-select-click.test.jsx b/test/unit/components/tool-select-click.test.jsx
deleted file mode 100644
index 196a3479..00000000
--- a/test/unit/components/tool-select-click.test.jsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/* eslint-env jest */
-import React from 'react'; // eslint-disable-line no-unused-vars
-import {shallow} from 'enzyme';
-import ToolSelectComponent from '../../../src/components/tool-select-base/tool-select-base.jsx'; // eslint-disable-line no-unused-vars, max-len
-
-describe('ToolSelectComponent', () => {
-    test('triggers callback when clicked', () => {
-        const onClick = jest.fn();
-        const componentShallowWrapper = shallow(
-            <ToolSelectComponent
-                imgDescriptor={{
-                    defaultMessage: 'Select',
-                    description: 'Label for the select tool, which allows selecting, moving, and resizing shapes',
-                    id: 'paint.selectMode.select'
-                }}
-                imgSrc={''}
-                isSelected={false}
-                onMouseDown={onClick}
-            />
-        );
-        componentShallowWrapper.simulate('click');
-        expect(onClick).toHaveBeenCalled();
-    });
-});