diff --git a/app/pages/__tests__/InstanceCreatePage.spec.tsx b/app/pages/__tests__/InstanceCreatePage.spec.tsx
index e2306a2c3b..cd22bd828a 100644
--- a/app/pages/__tests__/InstanceCreatePage.spec.tsx
+++ b/app/pages/__tests__/InstanceCreatePage.spec.tsx
@@ -93,17 +93,15 @@ describe('InstanceCreatePage', () => {
 
   it('navigates to project instances page on success', async () => {
     const mock = fetchMock.post(instancesUrl, { status: 201, body: instance })
-    const { history } = renderPage()
+    renderPage()
 
     const instancesPage = `/orgs/${org.name}/projects/${project.name}/instances`
-    expect(history.location.pathname).not.toEqual(instancesPage)
+    expect(window.location.pathname).not.toEqual(instancesPage)
 
     fireEvent.click(submitButton())
 
     await waitFor(() => expect(mock.called(instancesUrl)).toBeTruthy())
     await waitFor(() => expect(mock.done()).toBeTruthy())
-    await waitFor(() =>
-      expect(history.location.pathname).toEqual(instancesPage)
-    )
+    await waitFor(() => expect(window.location.pathname).toEqual(instancesPage))
   })
 })
diff --git a/app/pages/__tests__/ProjectCreatePage.spec.tsx b/app/pages/__tests__/ProjectCreatePage.spec.tsx
index f0a480b685..4eeecbcdb8 100644
--- a/app/pages/__tests__/ProjectCreatePage.spec.tsx
+++ b/app/pages/__tests__/ProjectCreatePage.spec.tsx
@@ -116,12 +116,12 @@ describe('ProjectCreatePage', () => {
     // instances fetch after success
     fetchMock.get(instancesUrl, { status: 200, body: { items: [] } })
 
-    const { history } = renderPage()
+    renderPage()
     const projectPath = `/orgs/${org.name}/projects/${project.name}/instances`
-    expect(history.location.pathname).not.toEqual(projectPath)
+    expect(window.location.pathname).not.toEqual(projectPath)
 
     fireEvent.click(submitButton())
 
-    await waitFor(() => expect(history.location.pathname).toEqual(projectPath))
+    await waitFor(() => expect(window.location.pathname).toEqual(projectPath))
   })
 })
diff --git a/app/test-utils.tsx b/app/test-utils.tsx
index d92c47a4ae..14aa77d186 100644
--- a/app/test-utils.tsx
+++ b/app/test-utils.tsx
@@ -1,9 +1,5 @@
 import React from 'react'
-import {
-  BrowserRouter,
-  unstable_HistoryRouter as HistoryRouter,
-} from 'react-router-dom'
-import { createMemoryHistory } from 'history'
+import { BrowserRouter } from 'react-router-dom'
 import { render } from '@testing-library/react'
 import { QueryClient, QueryClientProvider } from 'react-query'
 import type { FetchMockStatic } from 'fetch-mock'
@@ -36,13 +32,8 @@ export const renderWithRouter = (ui: React.ReactElement) =>
   })
 
 export function renderAppAt(location: string) {
-  const history = createMemoryHistory({ initialEntries: [location] })
-  const rendered = render(
-    <HistoryRouter history={history}>
-      <QueryClientProvider client={queryClient}>{routes}</QueryClientProvider>
-    </HistoryRouter>
-  )
-  return { history, rendered }
+  window.history.pushState({}, 'Test page', location)
+  return renderWithRouter(routes)
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any