diff --git a/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx b/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx
index b1bd398d15..58785c5c90 100644
--- a/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx
+++ b/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx
@@ -15,13 +15,10 @@
  */
 
 import React from 'react';
-import { render, fireEvent } from '@testing-library/react';
-import {
-  wrapInTestApp,
-  Keyboard,
-  renderInTestApp,
-} from '@backstage/test-utils';
+import { fireEvent } from '@testing-library/react';
+import { renderInTestApp } from '@backstage/test-utils';
 import { HeaderActionMenu } from './HeaderActionMenu';
+import userEvent from '@testing-library/user-event';
 
 describe('<ComponentContextMenu />', () => {
   it('renders without any items and without exploding', async () => {
@@ -89,16 +86,13 @@ describe('<ComponentContextMenu />', () => {
   });
 
   it('should close when hitting escape', async () => {
-    const rendered = render(
-      wrapInTestApp(
-        <HeaderActionMenu actionItems={[{ label: 'Some label' }]} />,
-      ),
+    const rendered = await renderInTestApp(
+      <HeaderActionMenu actionItems={[{ label: 'Some label' }]} />,
     );
-
     expect(rendered.container.getAttribute('aria-hidden')).toBeNull();
     fireEvent.click(rendered.getByTestId('header-action-menu'));
     expect(rendered.container.getAttribute('aria-hidden')).toBe('true');
-    await Keyboard.type(rendered, '<Esc>');
+    userEvent.type(rendered.getByTestId('header-action-menu'), '{esc}');
     expect(rendered.container.getAttribute('aria-hidden')).toBeNull();
   });
 });
diff --git a/packages/test-utils/src/testUtils/Keyboard.js b/packages/test-utils/src/testUtils/Keyboard.js
index 3f4724d562..0d46d26363 100644
--- a/packages/test-utils/src/testUtils/Keyboard.js
+++ b/packages/test-utils/src/testUtils/Keyboard.js
@@ -25,7 +25,7 @@ const codes = {
 
 /**
  * @public
- * @deprecated because it has no usages. Perhaps resurfaced in the future when need be.
+ * @deprecated superseded by @testing-library/user-event
  */
 export class Keyboard {
   static async type(target, input) {