diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.spec.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.spec.tsx
index f0657dd99dd71c..f4f3bf64aafe7b 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.spec.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.spec.tsx
@@ -1,9 +1,13 @@
 import {GroupFixture} from 'sentry-fixture/group';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
-import {RouterFixture} from 'sentry-fixture/routerFixture';
 
-import {render, screen, waitFor} from 'sentry-test/reactTestingLibrary';
+import {
+  render,
+  screen,
+  waitFor,
+  type RouterConfig,
+} from 'sentry-test/reactTestingLibrary';
 
 import GroupStore from 'sentry/stores/groupStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
@@ -13,9 +17,12 @@ describe('SimilarIssuesDrawer', () => {
   const organization = OrganizationFixture();
   const project = ProjectFixture({features: ['similarity-view']});
   const group = GroupFixture();
-  const router = RouterFixture({
-    params: {groupId: group.id},
-  });
+  const initialRouterConfig: RouterConfig = {
+    location: {
+      pathname: `/organizations/${organization.slug}/issues/${group.id}/similar/`,
+    },
+    route: '/organizations/:orgId/issues/:groupId/similar/',
+  };
   let mockSimilarIssues: jest.Mock;
 
   beforeEach(() => {
@@ -53,8 +60,7 @@ describe('SimilarIssuesDrawer', () => {
   it('renders the content as expected', async () => {
     render(<SimilarIssuesDrawer group={group} project={project} />, {
       organization,
-      router,
-      deprecatedRouterMocks: true,
+      initialRouterConfig,
     });
 
     expect(
diff --git a/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.spec.tsx b/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.spec.tsx
index cb036fb52bb2da..502db78a27d7ec 100644
--- a/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.spec.tsx
+++ b/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.spec.tsx
@@ -1,15 +1,19 @@
 import {EventFixture} from 'sentry-fixture/event';
 import {GroupFixture} from 'sentry-fixture/group';
-import {LocationFixture} from 'sentry-fixture/locationFixture';
-import {RouterFixture} from 'sentry-fixture/routerFixture';
+import {OrganizationFixture} from 'sentry-fixture/organization';
 
-import {initializeOrg} from 'sentry-test/initializeOrg';
-import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
+import {
+  render,
+  screen,
+  userEvent,
+  waitFor,
+  type RouterConfig,
+} from 'sentry-test/reactTestingLibrary';
 
 import {IssueDetailsEventNavigation} from './issueDetailsEventNavigation';
 
 describe('IssueDetailsEventNavigation', () => {
-  const {organization, router} = initializeOrg();
+  const organization = OrganizationFixture();
   const group = GroupFixture({id: 'group-id'});
   const testEvent = EventFixture({
     id: 'event-id',
@@ -28,6 +32,24 @@ describe('IssueDetailsEventNavigation', () => {
     event: testEvent,
     group,
   };
+  const routerConfigBase: Pick<RouterConfig, 'routes'> = {
+    routes: [
+      '/organizations/:orgId/issues/:groupId/events/',
+      '/organizations/:orgId/issues/:groupId/events/:eventId/',
+    ],
+  };
+  const latestRouterConfig: RouterConfig = {
+    ...routerConfigBase,
+    location: {
+      pathname: `/organizations/${organization.slug}/issues/${group.id}/events/latest/`,
+    },
+  };
+  const recommendedRouterConfig: RouterConfig = {
+    ...routerConfigBase,
+    location: {
+      pathname: `/organizations/${organization.slug}/issues/${group.id}/events/recommended/`,
+    },
+  };
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -39,58 +61,63 @@ describe('IssueDetailsEventNavigation', () => {
 
   describe('recommended event tabs', () => {
     it('can navigate to the oldest event', async () => {
-      render(<IssueDetailsEventNavigation {...defaultProps} isSmallNav />, {
-        router,
-        deprecatedRouterMocks: true,
-      });
+      const {router} = render(
+        <IssueDetailsEventNavigation {...defaultProps} isSmallNav />,
+        {
+          initialRouterConfig: latestRouterConfig,
+        }
+      );
 
       await userEvent.click(await screen.findByRole('tab', {name: 'First'}));
 
-      expect(router.push).toHaveBeenCalledWith({
-        pathname: '/organizations/org-slug/issues/group-id/events/oldest/',
-        query: {referrer: 'oldest-event'},
-      });
+      await waitFor(() =>
+        expect(router.location.pathname).toBe(
+          '/organizations/org-slug/issues/group-id/events/oldest/'
+        )
+      );
+      expect(router.location.query).toEqual({referrer: 'oldest-event'});
     });
 
     it('can navigate to the latest event', async () => {
-      render(<IssueDetailsEventNavigation {...defaultProps} isSmallNav />, {
-        router,
-        deprecatedRouterMocks: true,
-      });
+      const {router} = render(
+        <IssueDetailsEventNavigation {...defaultProps} isSmallNav />,
+        {
+          initialRouterConfig: recommendedRouterConfig,
+        }
+      );
 
       await userEvent.click(await screen.findByRole('tab', {name: 'Latest'}));
 
-      expect(router.push).toHaveBeenCalledWith({
-        pathname: '/organizations/org-slug/issues/group-id/events/latest/',
-        query: {referrer: 'latest-event'},
-      });
+      await waitFor(() =>
+        expect(router.location.pathname).toBe(
+          '/organizations/org-slug/issues/group-id/events/latest/'
+        )
+      );
+      expect(router.location.query).toEqual({referrer: 'latest-event'});
     });
 
     it('can navigate to the recommended event', async () => {
-      const recommendedEventRouter = RouterFixture({
-        params: {eventId: 'latest'},
-        location: LocationFixture({
-          pathname: `/organizations/org-slug/issues/group-id/events/latest/`,
-        }),
-      });
-
-      render(<IssueDetailsEventNavigation {...defaultProps} isSmallNav />, {
-        router: recommendedEventRouter,
-        deprecatedRouterMocks: true,
-      });
+      const {router} = render(
+        <IssueDetailsEventNavigation {...defaultProps} isSmallNav />,
+        {
+          initialRouterConfig: latestRouterConfig,
+        }
+      );
 
       await userEvent.click(await screen.findByRole('tab', {name: 'Rec.'}));
 
-      expect(recommendedEventRouter.push).toHaveBeenCalledWith({
-        pathname: '/organizations/org-slug/issues/group-id/events/recommended/',
-        query: {referrer: 'recommended-event'},
-      });
+      await waitFor(() =>
+        expect(router.location.pathname).toBe(
+          '/organizations/org-slug/issues/group-id/events/recommended/'
+        )
+      );
+      expect(router.location.query).toEqual({referrer: 'recommended-event'});
     });
   });
 
   it('can navigate next/previous events', async () => {
     render(<IssueDetailsEventNavigation {...defaultProps} />, {
-      deprecatedRouterMocks: true,
+      initialRouterConfig: latestRouterConfig,
     });
 
     expect(await screen.findByRole('button', {name: 'Previous Event'})).toHaveAttribute(
@@ -117,7 +144,7 @@ describe('IssueDetailsEventNavigation', () => {
       body: EventFixture(),
     });
     render(<IssueDetailsEventNavigation {...defaultProps} event={event} />, {
-      deprecatedRouterMocks: true,
+      initialRouterConfig: latestRouterConfig,
     });
 
     expect(mockNextEvent).not.toHaveBeenCalled();
diff --git a/static/app/views/issueList/issueViews/issueViewsList/issueViewsList.spec.tsx b/static/app/views/issueList/issueViews/issueViewsList/issueViewsList.spec.tsx
index 0a9b714dcee053..ebc26b6069df99 100644
--- a/static/app/views/issueList/issueViews/issueViewsList/issueViewsList.spec.tsx
+++ b/static/app/views/issueList/issueViews/issueViewsList/issueViewsList.spec.tsx
@@ -112,7 +112,7 @@ describe('IssueViewsList', () => {
       ],
     });
 
-    render(<IssueViewsList />, {organization, deprecatedRouterMocks: false});
+    render(<IssueViewsList />, {organization});
 
     // By default, sorts by popularity (desc) then visited (desc) then created (desc)
     await waitFor(() => {