diff --git a/packages/core/src/components/SupportButton/SupportButton.test.tsx b/packages/core/src/components/SupportButton/SupportButton.test.tsx
new file mode 100644
index 0000000000..6d6b9fd477
--- /dev/null
+++ b/packages/core/src/components/SupportButton/SupportButton.test.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import {
+  render,
+  act,
+  RenderResult,
+  waitFor,
+  fireEvent,
+} from '@testing-library/react';
+import { wrapInTestApp } from '@backstage/test-utils';
+import { SupportButton } from './SupportButton';
+
+const SUPPORT_BUTTON_ID = 'support-button';
+const POPOVER_ID = 'support-button-popover';
+
+describe('<SupportButton />', () => {
+  it('renders without exploding', async () => {
+    let renderResult: RenderResult;
+
+    await act(async () => {
+      renderResult = render(wrapInTestApp(<SupportButton />));
+    });
+
+    await waitFor(() =>
+      expect(renderResult.getByTestId(SUPPORT_BUTTON_ID)).toBeInTheDocument(),
+    );
+  });
+
+  it('shows popover on click', async () => {
+    let renderResult: RenderResult;
+
+    await act(async () => {
+      renderResult = render(wrapInTestApp(<SupportButton />));
+    });
+
+    let button: HTMLElement;
+
+    await waitFor(() => {
+      expect(renderResult.getByTestId(SUPPORT_BUTTON_ID)).toBeInTheDocument();
+      button = renderResult.getByTestId(SUPPORT_BUTTON_ID);
+    });
+
+    await act(async () => {
+      fireEvent.click(button);
+    });
+
+    await waitFor(() => {
+      expect(renderResult.getByTestId(POPOVER_ID)).toBeInTheDocument();
+    });
+  });
+});
diff --git a/packages/core/src/components/SupportButton/SupportButton.tsx b/packages/core/src/components/SupportButton/SupportButton.tsx
index f8c09f5073..537ee3d6ea 100644
--- a/packages/core/src/components/SupportButton/SupportButton.tsx
+++ b/packages/core/src/components/SupportButton/SupportButton.tsx
@@ -87,6 +87,7 @@ export const SupportButton: FC<Props> = ({
         Support
       </Button>
       <Popover
+        data-testid="support-button-popover"
         open={popoverOpen}
         anchorEl={anchorEl}
         anchorOrigin={{
@@ -120,7 +121,8 @@ export const SupportButton: FC<Props> = ({
                 <GroupIcon />
               </ListItemIcon>
               <ListItemText
-                primary="Support"
+                disableTypography
+                primary={<Typography>Support</Typography>}
                 secondary={
                   <div>
                     {slackChannels.map((channel, i) => (
@@ -137,7 +139,8 @@ export const SupportButton: FC<Props> = ({
                 <GroupIcon />
               </ListItemIcon>
               <ListItemText
-                primary="Contact"
+                disableTypography
+                primary={<Typography>Contact</Typography>}
                 secondary={
                   <div>
                     {contactEmails.map((em, index) => (