diff --git a/packages/playwright/src/index.ts b/packages/playwright/src/index.ts
index a08f3790d9..27f1e9320b 100644
--- a/packages/playwright/src/index.ts
+++ b/packages/playwright/src/index.ts
@@ -618,9 +618,10 @@ class ArtifactsRecorder {
     if (captureScreenshots)
       await this._screenshotOnTestFailure();
 
-    const leftoverContexts: BrowserContext[] = [];
+    let leftoverContexts: BrowserContext[] = [];
     for (const browserType of [this._playwright.chromium, this._playwright.firefox, this._playwright.webkit])
       leftoverContexts.push(...(browserType as any)._contexts);
+    leftoverContexts = leftoverContexts.filter(context => !this._reusedContexts.has(context));
     const leftoverApiRequests: APIRequestContext[] =  Array.from((this._playwright.request as any)._contexts as Set<APIRequestContext>);
 
     // Collect traces/screenshots for remaining contexts.
diff --git a/tests/playwright-test/playwright.reuse.spec.ts b/tests/playwright-test/playwright.reuse.spec.ts
index 0620195f65..9732750474 100644
--- a/tests/playwright-test/playwright.reuse.spec.ts
+++ b/tests/playwright-test/playwright.reuse.spec.ts
@@ -96,6 +96,14 @@ test('should reuse context with trace if mode=when-possible', async ({ runInline
       import { test, expect } from '@playwright/test';
       let lastContextGuid;
 
+      test.beforeAll(async () => {
+        console.log('fromBeforeAll');
+      });
+
+      test.afterAll(async () => {
+        console.log('fromAfterAll');
+      });
+
       test('one', async ({ context, page }) => {
         lastContextGuid = context._guid;
         await page.setContent('<button>Click</button>');
@@ -113,10 +121,13 @@ test('should reuse context with trace if mode=when-possible', async ({ runInline
 
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(2);
+  expect(result.output).toContain('fromBeforeAll');
+  expect(result.output).toContain('fromAfterAll');
 
   const trace1 = await parseTrace(testInfo.outputPath('test-results', 'reuse-one', 'trace.zip'));
   expect(trace1.actionTree).toEqual([
     'Before Hooks',
+    '  beforeAll hook',
     '  fixture: browser',
     '    browserType.launch',
     '  fixture: context',
@@ -143,6 +154,7 @@ test('should reuse context with trace if mode=when-possible', async ({ runInline
     'After Hooks',
     '  fixture: page',
     '  fixture: context',
+    '  afterAll hook',
   ]);
   expect(trace2.traceModel.storage().snapshotsForTest().length).toBeGreaterThan(0);
 });