diff --git a/tests/playwright-test/watch.spec.ts b/tests/playwright-test/watch.spec.ts
index 926d9def1d..dc3c111aee 100644
--- a/tests/playwright-test/watch.spec.ts
+++ b/tests/playwright-test/watch.spec.ts
@@ -16,6 +16,8 @@
 
 import { test, expect } from './playwright-test-fixtures';
 
+test.describe.configure({ mode: 'parallel' });
+
 test('should print dependencies in CJS mode', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'playwright.config.ts': `
@@ -122,7 +124,7 @@ test('should run tests on Enter', async ({ runWatchTest }) => {
   }, {});
   await testProcess.waitForOutput('a.test.ts:5:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
-  await testProcess.clearOutput();
+  testProcess.clearOutput();
   testProcess.write('\r\n');
   await testProcess.waitForOutput('npx playwright test #1');
   await testProcess.waitForOutput('a.test.ts:5:11 › passes');
@@ -137,14 +139,14 @@ test('should run tests on R', async ({ runWatchTest }) => {
   }, {});
   await testProcess.waitForOutput('a.test.ts:5:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
-  await testProcess.clearOutput();
+  testProcess.clearOutput();
   testProcess.write('r');
   await testProcess.waitForOutput('npx playwright test (re-running tests) #1');
   await testProcess.waitForOutput('a.test.ts:5:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
 });
 
-test('should re-run failed tests on F', async ({ runWatchTest }) => {
+test('should run failed tests on F', async ({ runWatchTest }) => {
   const testProcess = await runWatchTest({
     'a.test.ts': `
       pwt.test('passes', () => {});
@@ -161,9 +163,245 @@ test('should re-run failed tests on F', async ({ runWatchTest }) => {
   await testProcess.waitForOutput('c.test.ts:5:11 › fails');
   await testProcess.waitForOutput('Error: expect(received).toBe(expected)');
   await testProcess.waitForOutput('Waiting for file changes.');
-  await testProcess.clearOutput();
+  testProcess.clearOutput();
   testProcess.write('f');
   await testProcess.waitForOutput('npx playwright test (running failed tests) #1');
   await testProcess.waitForOutput('c.test.ts:5:11 › fails');
   expect(testProcess.output).not.toContain('a.test.ts:5:11');
 });
+
+test('should respect file filter P', async ({ runWatchTest }) => {
+  const testProcess = await runWatchTest({
+    'a.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+    'b.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+  }, {});
+  await testProcess.waitForOutput('a.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('b.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('p');
+  await testProcess.waitForOutput('Input filename pattern (regex)');
+  testProcess.write('b.test\r\n');
+  await testProcess.waitForOutput('npx playwright test b.test #1');
+  await testProcess.waitForOutput('b.test.ts:5:11 › passes');
+  expect(testProcess.output).not.toContain('a.test.ts:5:11');
+  await testProcess.waitForOutput('Waiting for file changes.');
+});
+
+test('should respect project filter C', async ({ runWatchTest }) => {
+  const testProcess = await runWatchTest({
+    'playwright.config.ts': `
+      import { defineConfig } from '@playwright/test';
+      export default defineConfig({ projects: [{name: 'foo'}, {name: 'bar'}] });
+    `,
+    'a.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+  }, {});
+  await testProcess.waitForOutput('[foo] › a.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('[bar] › a.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('c');
+  await testProcess.waitForOutput('Select projects');
+  await testProcess.waitForOutput('✔ foo');
+  await testProcess.waitForOutput('✔ bar');
+  testProcess.write(' ');
+  testProcess.write('\r\n');
+  await testProcess.waitForOutput('npx playwright test --project foo #1');
+  await testProcess.waitForOutput('[foo] › a.test.ts:5:11 › passes');
+  expect(testProcess.output).not.toContain('[bar] › a.test.ts:5:11 › passes');
+});
+
+test('should respect file filter P and split files', async ({ runWatchTest }) => {
+  const testProcess = await runWatchTest({
+    'a.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+    'b.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+  }, {});
+  await testProcess.waitForOutput('a.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('b.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('p');
+  await testProcess.waitForOutput('Input filename pattern (regex)');
+  testProcess.write('a.test b.test\r\n');
+  await testProcess.waitForOutput('npx playwright test a.test b.test #1');
+  await testProcess.waitForOutput('a.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('b.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('Waiting for file changes.');
+});
+
+test('should respect title filter T', async ({ runWatchTest }) => {
+  const testProcess = await runWatchTest({
+    'a.test.ts': `
+      pwt.test('title 1', () => {});
+    `,
+    'b.test.ts': `
+      pwt.test('title 2', () => {});
+    `,
+  }, {});
+  await testProcess.waitForOutput('a.test.ts:5:11 › title 1');
+  await testProcess.waitForOutput('b.test.ts:5:11 › title 2');
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('t');
+  await testProcess.waitForOutput('Input test name pattern (regex)');
+  testProcess.write('title 2\r\n');
+  await testProcess.waitForOutput('npx playwright test --grep title 2 #1');
+  await testProcess.waitForOutput('b.test.ts:5:11 › title 2');
+  expect(testProcess.output).not.toContain('a.test.ts:5:11');
+  await testProcess.waitForOutput('Waiting for file changes.');
+});
+
+test('should re-run failed tests on F > R', async ({ runWatchTest }) => {
+  const testProcess = await runWatchTest({
+    'a.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+    'b.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+    'c.test.ts': `
+      pwt.test('fails', () => { expect(1).toBe(2); });
+    `,
+  }, {});
+  await testProcess.waitForOutput('a.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('b.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('c.test.ts:5:11 › fails');
+  await testProcess.waitForOutput('Error: expect(received).toBe(expected)');
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('f');
+  await testProcess.waitForOutput('npx playwright test (running failed tests) #1');
+  await testProcess.waitForOutput('c.test.ts:5:11 › fails');
+  expect(testProcess.output).not.toContain('a.test.ts:5:11');
+  testProcess.clearOutput();
+  testProcess.write('r');
+  await testProcess.waitForOutput('npx playwright test (re-running tests) #2');
+  await testProcess.waitForOutput('c.test.ts:5:11 › fails');
+  expect(testProcess.output).not.toContain('a.test.ts:5:11');
+});
+
+test('should run on changed files', async ({ runWatchTest, writeFiles }) => {
+  const testProcess = await runWatchTest({
+    'a.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+    'b.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+    'c.test.ts': `
+      pwt.test('fails', () => { expect(1).toBe(2); });
+    `,
+  }, {});
+  await testProcess.waitForOutput('a.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('b.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('c.test.ts:5:11 › fails');
+  await testProcess.waitForOutput('Error: expect(received).toBe(expected)');
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  writeFiles({
+    'c.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+  });
+  await testProcess.waitForOutput('c.test.ts:5:11 › passes');
+  expect(testProcess.output).not.toContain('a.test.ts:5:11 › passes');
+  expect(testProcess.output).not.toContain('b.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('Waiting for file changes.');
+});
+
+test('should run on changed deps', async ({ runWatchTest, writeFiles }) => {
+  const testProcess = await runWatchTest({
+    'a.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+    'b.test.ts': `
+      import './helper';
+      pwt.test('passes', () => {});
+    `,
+    'helper.ts': `
+      console.log('old helper');
+    `,
+  }, {});
+  await testProcess.waitForOutput('a.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('b.test.ts:6:11 › passes');
+  await testProcess.waitForOutput('old helper');
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  writeFiles({
+    'helper.ts': `
+      console.log('new helper');
+    `,
+  });
+  await testProcess.waitForOutput('b.test.ts:6:11 › passes');
+  expect(testProcess.output).not.toContain('a.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('new helper');
+  await testProcess.waitForOutput('Waiting for file changes.');
+});
+
+test('should re-run changed files on R', async ({ runWatchTest, writeFiles }) => {
+  const testProcess = await runWatchTest({
+    'a.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+    'b.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+    'c.test.ts': `
+      pwt.test('fails', () => { expect(1).toBe(2); });
+    `,
+  }, {});
+  await testProcess.waitForOutput('a.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('b.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('c.test.ts:5:11 › fails');
+  await testProcess.waitForOutput('Error: expect(received).toBe(expected)');
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  writeFiles({
+    'c.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+  });
+  await testProcess.waitForOutput('c.test.ts:5:11 › passes');
+  expect(testProcess.output).not.toContain('a.test.ts:5:11 › passes');
+  expect(testProcess.output).not.toContain('b.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('r');
+  await testProcess.waitForOutput('c.test.ts:5:11 › passes');
+  expect(testProcess.output).not.toContain('a.test.ts:5:11 › passes');
+  expect(testProcess.output).not.toContain('b.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('Waiting for file changes.');
+});
+
+test('should not trigger on changes to non-tests', async ({ runWatchTest, writeFiles }) => {
+  const testProcess = await runWatchTest({
+    'a.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+    'b.test.ts': `
+      pwt.test('passes', () => {});
+    `,
+  }, {});
+  await testProcess.waitForOutput('a.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('b.test.ts:5:11 › passes');
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  writeFiles({
+    'helper.ts': `
+      console.log('helper');
+    `,
+  });
+  await new Promise(f => setTimeout(f, 1000));
+  expect(testProcess.output).not.toContain('a.test.ts');
+  expect(testProcess.output).not.toContain('b.test.ts');
+});