diff --git a/apps/browser/src/autofill/background/overlay.background.spec.ts b/apps/browser/src/autofill/background/overlay.background.spec.ts
index 72b17a14d30..13d09bd8dec 100644
--- a/apps/browser/src/autofill/background/overlay.background.spec.ts
+++ b/apps/browser/src/autofill/background/overlay.background.spec.ts
@@ -1,5 +1,7 @@
 import { mock, MockProxy, mockReset } from "jest-mock-extended";
-import { BehaviorSubject, of } from "rxjs";
+import { BehaviorSubject, Observable, of } from "rxjs";
+import { map } from "rxjs/operators";
+
 
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -39,6 +41,7 @@ import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault
 import { CipherRepromptType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { Fido2CredentialView } from "@bitwarden/common/vault/models/view/fido2-credential.view";
+import { GeneratedCredential } from "@bitwarden/generator-history";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
 import { BrowserPlatformUtilsService } from "../../platform/services/platform-utils/browser-platform-utils.service";
@@ -83,7 +86,11 @@ import { OverlayBackground } from "./overlay.background";
 
 describe("OverlayBackground", () => {
   const generatedPassword = "generated-password";
-  const generatedPasswordCallbackMock = jest.fn().mockResolvedValue(generatedPassword);
+  const generatedPasswordCallbackMock = jest
+    .fn()
+    .mockImplementation(($on: Observable<any>) =>
+      $on.pipe(map(() => new GeneratedCredential(generatedPassword, "password", new Date()))),
+    );
   const addPasswordCallbackMock = jest.fn();
   const mockUserId = Utils.newGuid() as UserId;
   const sendResponse = jest.fn();
diff --git a/apps/browser/src/background/main.background.spec.ts b/apps/browser/src/background/main.background.spec.ts
index 83c4a9597ea..caa61d45d28 100644
--- a/apps/browser/src/background/main.background.spec.ts
+++ b/apps/browser/src/background/main.background.spec.ts
@@ -11,3 +11,7 @@ describe("MainBackground sync task scheduling", () => {
     expect(bootstrapSource).toContain("this.backgroundSyncService.init();");
   });
 });
+
+// Note: yieldGeneratedPassword() and generatePasswordToClipboard() are tested
+// through integration tests in overlay.background.spec.ts where they are
+// exercised via the callback mechanism.