diff --git a/.vscode/settings.json b/.vscode/settings.json
index e9a32e850c980..8b92ff2228df0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -25,6 +25,7 @@
     "drpcserver",
     "Dsts",
     "enablements",
+    "eventsourcemock",
     "fatih",
     "Formik",
     "gitsshkey",
diff --git a/site/src/pages/UsersPage/UsersPage.test.tsx b/site/src/pages/UsersPage/UsersPage.test.tsx
index 1c5559fedaca0..a0fe53922d766 100644
--- a/site/src/pages/UsersPage/UsersPage.test.tsx
+++ b/site/src/pages/UsersPage/UsersPage.test.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-floating-promises */
 import { fireEvent, screen, waitFor, within } from "@testing-library/react"
 import userEvent from "@testing-library/user-event"
 import { i18n } from "i18n"
@@ -474,8 +473,7 @@ describe("UsersPage", () => {
           }),
         )
 
-        // eslint-disable-next-line @typescript-eslint/no-empty-function
-        await updateUserRole(() => {}, MockAuditorRole)
+        await updateUserRole(() => null, MockAuditorRole)
 
         // Check if the error message is displayed
         const errorMessage = await screen.findByText("message from the backend")
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.test.tsx b/site/src/pages/WorkspacePage/WorkspacePage.test.tsx
index 6512d5334587e..ae706932f974a 100644
--- a/site/src/pages/WorkspacePage/WorkspacePage.test.tsx
+++ b/site/src/pages/WorkspacePage/WorkspacePage.test.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-floating-promises */
 import { fireEvent, screen, waitFor } from "@testing-library/react"
 import userEvent from "@testing-library/user-event"
-import EventSource from "eventsourcemock"
+import EventSourceMock from "eventsourcemock"
 import i18next from "i18next"
 import { rest } from "msw"
 import * as api from "../../api/api"
@@ -70,13 +70,20 @@ const testStatus = async (ws: Workspace, label: string) => {
   expect(status).toHaveTextContent(label)
 }
 
+let originalEventSource: typeof window.EventSource
+
+beforeAll(() => {
+  originalEventSource = window.EventSource
+  // mocking out EventSource for SSE
+  window.EventSource = EventSourceMock
+})
+
 beforeEach(() => {
   jest.resetAllMocks()
+})
 
-  // mocking out EventSource for SSE
-  Object.defineProperty(window, "EventSource", {
-    value: EventSource,
-  })
+afterAll(() => {
+  window.EventSource = originalEventSource
 })
 
 describe("WorkspacePage", () => {