diff --git a/packages/ui-checkbox/src/Checkbox/index.tsx b/packages/ui-checkbox/src/Checkbox/index.tsx
index f07644ffb2..406a5befca 100644
--- a/packages/ui-checkbox/src/Checkbox/index.tsx
+++ b/packages/ui-checkbox/src/Checkbox/index.tsx
@@ -156,9 +156,10 @@ class Checkbox extends Component<CheckboxProps, CheckboxState> {
   }
 
   handleMouseOver = () => {
-    this.setState({
-      hovered: true
-    })
+    !this.props.disabled &&
+      this.setState({
+        hovered: true
+      })
   }
 
   handleMouseOut = () => {
diff --git a/packages/ui-spinner/src/Spinner/__new-tests__/Spinner.test.tsx b/packages/ui-spinner/src/Spinner/__new-tests__/Spinner.test.tsx
index 3fcde37c88..bc14508669 100644
--- a/packages/ui-spinner/src/Spinner/__new-tests__/Spinner.test.tsx
+++ b/packages/ui-spinner/src/Spinner/__new-tests__/Spinner.test.tsx
@@ -30,7 +30,9 @@ import Spinner from '../index'
 describe('<Spinner />', () => {
   describe('with the delay prop', () => {
     it('should delay rendering', async () => {
-      const { container } = render(<Spinner delay={300} />)
+      const { container } = render(
+        <Spinner renderTitle="Loading" delay={300} />
+      )
 
       const spinnerElements = container.querySelectorAll('[data-cid="Spinner"]')