diff --git a/‎packages/vitest/src/integrations/mock/when.ts‎
Lines changed: 2 additions & 2 deletions b/‎packages/vitest/src/integrations/mock/when.ts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎test/unit/test/mocking/vi-when.test.ts‎
Lines changed: 21 additions & 0 deletions b/‎test/unit/test/mocking/vi-when.test.ts‎
Lines changed: 21 additions & 0 deletions
@@ -85,7 +85,7 @@ type CalledWithInstance<ReturnType, Fn extends Procedure> = When<Fn> & {
    * @param options - Optional behavior configuration.
    * @returns The same {@linkcode when|vi.when} instance for chaining.
    */
-  thenResolve: (value: ReturnType, options?: BehaviorOptions | undefined) => CalledWithInstance<ReturnType, Fn>
+  thenResolve: (value: Awaited<ReturnType>, options?: BehaviorOptions | undefined) => CalledWithInstance<ReturnType, Fn>
 
   /**
    * Schedules a synchronous return value for a single call with the registered arguments, then removes the behavior.
@@ -103,7 +103,7 @@ type CalledWithInstance<ReturnType, Fn extends Procedure> = When<Fn> & {
    * @param options - Optional behavior configuration.
    * @returns The same {@linkcode when|vi.when} instance for chaining.
    */
-  thenResolveOnce: (value: ReturnType, options?: OnceBehaviorOptions | undefined) => CalledWithInstance<ReturnType, Fn>
+  thenResolveOnce: (value: Awaited<ReturnType>, options?: OnceBehaviorOptions | undefined) => CalledWithInstance<ReturnType, Fn>
 
   /**
    * Schedules a thrown error for when the spy is called with the registered arguments.
 
@@ -136,6 +136,27 @@ describe('vi.when()', () => {
       expect(w).toHaveBeenExhausted()
     })
 
+    test('resolves with an unwrapped value for an async function', async () => {
+      const spy = vi.fn<(...args: FnData['args']) => Promise<FnData['value']>>()
+
+      const args: FnData['args'] = ['a', 0]
+      const value: FnData['value'] = 97
+
+      const w = vi.when(spy)
+        .calledWith(...args)
+        .thenResolve(value)
+        .thenResolveOnce(value)
+
+      expect(w).not.toHaveBeenExhausted()
+
+      await expect(spy(...args)).resolves.toBe(value)
+      await expect(spy(...args)).resolves.toBe(value)
+
+      expect(spy).toHaveBeenCalledTimes(2)
+
+      expect(w).toHaveBeenExhausted()
+    })
+
     test('rejects a promise when using `toReject`', async () => {
       const spy = vi.fn<Fn>()