diff --git a/package.json b/package.json
index 5c45c4e17e..437ce36c4b 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "tsc": "tsc",
     "clean": "backstage-cli clean && lerna run clean",
     "diff": "lerna run diff --",
-    "test": "lerna run test --since origin/master --parallel -- --coverage",
+    "test": "lerna run test --since origin/master -- --coverage",
     "test:all": "lerna run test -- --coverage",
     "lint": "lerna run lint --since origin/master --",
     "lint:all": "lerna run lint --",
diff --git a/packages/core-api/src/app/App.tsx b/packages/core-api/src/app/App.tsx
index c408303205..3f77d826ae 100644
--- a/packages/core-api/src/app/App.tsx
+++ b/packages/core-api/src/app/App.tsx
@@ -191,9 +191,7 @@ export class PrivateAppImpl implements BackstageApp {
         <ApiProvider apis={apis}>
           <AppContextProvider app={this}>
             <AppThemeProvider>
-              <Router>
-                <Routes basename={pathname}>{children}</Routes>
-              </Router>
+              <Router>{children}</Router>
             </AppThemeProvider>
           </AppContextProvider>
         </ApiProvider>
diff --git a/packages/core/src/components/Button/Button.test.jsx b/packages/core/src/components/Button/Button.test.jsx
index 2563d367c2..bf057e4261 100644
--- a/packages/core/src/components/Button/Button.test.jsx
+++ b/packages/core/src/components/Button/Button.test.jsx
@@ -15,26 +15,25 @@
  */
 
 import React from 'react';
-import { render, fireEvent } from '@testing-library/react';
+import { render, fireEvent, act } from '@testing-library/react';
 import { wrapInTestApp } from '@backstage/test-utils';
 import { Button } from './Button';
-import { MemoryRouter, Route } from 'react-router';
-import { act } from 'react-dom/test-utils';
+import { Route } from 'react-router';
 
 describe('<Button />', () => {
   it('navigates using react-router', async () => {
     const testString = 'This is test string';
     const buttonLabel = 'Navigate!';
-    const { getByText } = render(
+    const { getByText, getByRole } = render(
       wrapInTestApp(
-        <MemoryRouter>
+        <>
+          <Route path="/test" element={<p>{testString}</p>} />
           <Button to="/test">{buttonLabel}</Button>
-          <Route path="/test">{testString}</Route>{' '}
-        </MemoryRouter>,
+        </>,
       ),
     );
     expect(() => getByText(testString)).toThrow();
-    await act(async () => fireEvent.click(getByText(buttonLabel)));
+    await act(async () => fireEvent.click(getByRole('button')));
     expect(getByText(testString)).toBeInTheDocument();
   });
 });
diff --git a/packages/core/src/components/Link/Link.test.jsx b/packages/core/src/components/Link/Link.test.jsx
index fcbc92a67a..c35cdfdbe6 100644
--- a/packages/core/src/components/Link/Link.test.jsx
+++ b/packages/core/src/components/Link/Link.test.jsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { render, fireEvent } from '@testing-library/react';
 import { wrapInTestApp } from '@backstage/test-utils';
 import { Link } from './Link';
-import { MemoryRouter, Route } from 'react-router';
+import { Route } from 'react-router';
 import { act } from 'react-dom/test-utils';
 
 describe('<Link />', () => {
@@ -27,14 +27,15 @@ describe('<Link />', () => {
     const linkText = 'Navigate!';
     const { getByText } = render(
       wrapInTestApp(
-        <MemoryRouter>
+        <>
           <Link to="/test">{linkText}</Link>
           <Route path="/test">{testString}</Route>
-        </MemoryRouter>,
+        </>,
       ),
     );
     expect(() => getByText(testString)).toThrow();
     await act(async () => fireEvent.click(getByText(linkText)));
+
     expect(getByText(testString)).toBeInTheDocument();
   });
 });
diff --git a/plugins/lighthouse/src/components/AuditView/index.tsx b/plugins/lighthouse/src/components/AuditView/index.tsx
index af7636cf59..06ab812cf4 100644
--- a/plugins/lighthouse/src/components/AuditView/index.tsx
+++ b/plugins/lighthouse/src/components/AuditView/index.tsx
@@ -18,7 +18,6 @@ import { Link, useParams } from 'react-router-dom';
 import { useAsync } from 'react-use';
 import {
   makeStyles,
-  Button,
   Grid,
   List,
   ListItem,
@@ -33,6 +32,7 @@ import {
   Header,
   Page,
   Content,
+  Button,
   ContentHeader,
   HeaderLabel,
   Progress,