diff --git a/test/test-utils/client.ts b/test/test-utils/client.ts
index 658536825b..f4d35220c2 100644
--- a/test/test-utils/client.ts
+++ b/test/test-utils/client.ts
@@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import EventEmitter from "events";
 import { type MethodLikeKeys, mocked, type MockedObject, type PropertyLikeKeys } from "jest-mock";
 import { Feature, ServerSupport } from "matrix-js-sdk/src/feature";
-import { type MatrixClient, type Room, MatrixError, User } from "matrix-js-sdk/src/matrix";
+import { type MatrixClient, type Room, User } from "matrix-js-sdk/src/matrix";
 
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 
@@ -138,7 +138,6 @@ export const mockClientMethodsServer = (): Partial<Record<MethodLikeKeys<MatrixC
     isVersionSupported: jest.fn().mockResolvedValue(false),
     getVersions: jest.fn().mockResolvedValue({}),
     isFallbackICEServerAllowed: jest.fn(),
-    getAuthIssuer: jest.fn().mockRejectedValue(new MatrixError({ errcode: "M_UNKNOWN" }, 404)),
 });
 
 export const mockClientMethodsDevice = (
diff --git a/test/unit-tests/DecryptionFailureTracker-test.ts b/test/unit-tests/DecryptionFailureTracker-test.ts
index 754a621a4f..bad06a59c0 100644
--- a/test/unit-tests/DecryptionFailureTracker-test.ts
+++ b/test/unit-tests/DecryptionFailureTracker-test.ts
@@ -125,8 +125,8 @@ describe("DecryptionFailureTracker", function () {
 
         // use three different errors so that we can distinguish the reports
         const error1 = DecryptionFailureCode.MEGOLM_UNKNOWN_INBOUND_SESSION_ID;
-        const error2 = DecryptionFailureCode.MEGOLM_BAD_ROOM;
-        const error3 = DecryptionFailureCode.MEGOLM_MISSING_FIELDS;
+        const error2 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD_FOR_UNVERIFIED_DEVICE;
+        const error3 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD;
 
         // event that will be marked as visible before it's marked as undecryptable
         const markedVisibleFirst = await createFailedDecryptionEvent({ code: error1 });
@@ -536,8 +536,8 @@ describe("DecryptionFailureTracker", function () {
 
         // use three different errors so that we can distinguish the reports
         const error1 = DecryptionFailureCode.MEGOLM_UNKNOWN_INBOUND_SESSION_ID;
-        const error2 = DecryptionFailureCode.MEGOLM_BAD_ROOM;
-        const error3 = DecryptionFailureCode.MEGOLM_MISSING_FIELDS;
+        const error2 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD_FOR_UNVERIFIED_DEVICE;
+        const error3 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD;
 
         // event that will be slow to decrypt
         const lateDecryption = await createFailedDecryptionEvent({ code: error1 });
@@ -638,8 +638,8 @@ describe("DecryptionFailureTracker", function () {
 
         // use three different errors so that we can distinguish the reports
         const error1 = DecryptionFailureCode.MEGOLM_UNKNOWN_INBOUND_SESSION_ID;
-        const error2 = DecryptionFailureCode.MEGOLM_BAD_ROOM;
-        const error3 = DecryptionFailureCode.MEGOLM_MISSING_FIELDS;
+        const error2 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD_FOR_UNVERIFIED_DEVICE;
+        const error3 = DecryptionFailureCode.MEGOLM_KEY_WITHHELD;
 
         // event from a federated user (@alice:example.com)
         const federatedDecryption = await createFailedDecryptionEvent({
diff --git a/test/unit-tests/components/structures/UserMenu-test.tsx b/test/unit-tests/components/structures/UserMenu-test.tsx
index 177adbaf11..0bc9015c69 100644
--- a/test/unit-tests/components/structures/UserMenu-test.tsx
+++ b/test/unit-tests/components/structures/UserMenu-test.tsx
@@ -112,7 +112,6 @@ describe("<UserMenu>", () => {
 
     it("should render 'Link new device' button in OIDC native mode", async () => {
         sdkContext.client = stubClient();
-        mocked(sdkContext.client.getAuthIssuer).mockResolvedValue({ issuer: "https://issuer/" });
         const openIdMetadata = mockOpenIdConfiguration("https://issuer/");
         openIdMetadata.grant_types_supported.push(DEVICE_CODE_SCOPE);
         fetchMock.get("https://issuer/.well-known/openid-configuration", openIdMetadata);