diff --git a/tests/components/ct-vue2-cli/playwright.config.ts b/tests/components/ct-vue2-cli/playwright.config.ts
index d2e42fcc67..3ddd17c7ea 100644
--- a/tests/components/ct-vue2-cli/playwright.config.ts
+++ b/tests/components/ct-vue2-cli/playwright.config.ts
@@ -15,14 +15,22 @@
  */
 
 import { type PlaywrightTestConfig, devices } from '@playwright/experimental-ct-vue2';
+import { resolve } from 'path';
 
 const config: PlaywrightTestConfig = {
-  testDir: 'src',
+  testDir: 'tests',
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
   reporter: 'html',
   use: {
     trace: 'on-first-retry',
+    ctViteConfig: {
+      resolve: {
+        alias: {
+          '@': resolve(__dirname, './src'),
+        }
+      }
+    }
   },
   projects: [
     {
diff --git a/tests/components/ct-vue2-cli/playwright/index.html b/tests/components/ct-vue2-cli/playwright/index.html
index 943d4d14db..9ee6c8206e 100644
--- a/tests/components/ct-vue2-cli/playwright/index.html
+++ b/tests/components/ct-vue2-cli/playwright/index.html
@@ -7,6 +7,6 @@
   </head>
   <body>
     <div id="root"></div>
-    <script type="module" src="./index.ts"></script>
+    <script type="module" src="./index.js"></script>
   </body>
 </html>
diff --git a/tests/components/ct-vue2-cli/playwright/index.ts b/tests/components/ct-vue2-cli/playwright/index.js
similarity index 57%
rename from tests/components/ct-vue2-cli/playwright/index.ts
rename to tests/components/ct-vue2-cli/playwright/index.js
index d608a40218..f5bd21d70d 100644
--- a/tests/components/ct-vue2-cli/playwright/index.ts
+++ b/tests/components/ct-vue2-cli/playwright/index.js
@@ -3,20 +3,15 @@ import Router from 'vue-router';
 import { router } from '../src/router';
 import '../src/assets/index.css';
 
-export type HooksConfig = {
-  route?: string;
-  routing?: boolean;
-}
-
-beforeMount<HooksConfig>(async ({ Vue, hooksConfig }) => {
+beforeMount(async ({ Vue, hooksConfig }) => {
   console.log(`Before mount: ${JSON.stringify(hooksConfig)}`);
 
   if (hooksConfig?.routing) {
-    Vue.use(Router as any); // TODO: remove any and fix the various installed conflicting Vue versions
+    Vue.use(Router);
     return { router }
   }
 });
 
-afterMount<HooksConfig>(async ({ instance }) => {
+afterMount(async ({ instance }) => {
   console.log(`After mount el: ${instance.$el.constructor.name}`);
 });
diff --git a/tests/components/ct-vue2-cli/src/notation-jsx.spec.tsx b/tests/components/ct-vue2-cli/src/notation-jsx.spec.tsx
deleted file mode 100644
index f023394b50..0000000000
--- a/tests/components/ct-vue2-cli/src/notation-jsx.spec.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2'
-import App from './App.vue';
-import Button from './components/Button.vue';
-import Counter from './components/Counter.vue';
-import DefaultSlot from './components/DefaultSlot.vue';
-import NamedSlots from './components/NamedSlots.vue';
-import EmptyTemplate from './components/EmptyTemplate.vue';
-import type { HooksConfig } from '../playwright';
-
-test.use({ viewport: { width: 500, height: 500 } })
-
-test('render props', async ({ mount }) => {
-  const component = await mount(<Button title="Submit" />)
-  await expect(component).toContainText('Submit')
-})
-
-test('render attributes', async ({ mount }) => {
-  const component = await mount(<Button class="primary" title="Submit" />)
-  await expect(component).toHaveClass('primary');
-});
-
-test('update props without remounting', async ({ mount }) => {
-  const component = await mount(<Counter count={9001} />)
-  await expect(component.locator('#props')).toContainText('9001')
-
-  await component.update(<Counter count={1337} />)
-  await expect(component).not.toContainText('9001')
-  await expect(component.locator('#props')).toContainText('1337')
-
-  await expect(component.locator('#remount-count')).toContainText('1')
-})
-
-test('update event listeners without remounting', async ({ mount }) => {
-  const messages: string[] = []
-  const component = await mount(<Counter />)
-
-  await component.update(<Counter 
-    v-on:submit={(count: string) => { 
-      messages.push(count) 
-    }}
-  />)
-  await component.click();
-  expect(messages).toEqual(['hello'])
-  
-  await expect(component.locator('#remount-count')).toContainText('1')
-})
-
-test('update slots without remounting', async ({ mount }) => {
-  const component = await mount(<Counter>Default Slot</Counter>)
-  await expect(component).toContainText('Default Slot')
-
-  await component.update(<Counter>
-    <template v-slot:main>Test Slot</template>
-  </Counter>)
-  await expect(component).not.toContainText('Default Slot')
-  await expect(component).toContainText('Test Slot')
-
-  await expect(component.locator('#remount-count')).toContainText('1')
-})
-
-test('emit an submit event when the button is clicked', async ({ mount }) => {
-  const messages: string[] = []
-  const component = await mount(<Button 
-    title="Submit"
-    v-on:submit={(data: string) => {
-      messages.push(data)
-    }} 
-  />)
-  await component.click()
-  expect(messages).toEqual(['hello'])
-})
-
-test('render a default slot', async ({ mount }) => {
-  const component = await mount(<DefaultSlot>
-    Main Content
-  </DefaultSlot>)
-  await expect(component).toContainText('Main Content')
-})
-
-test('render a component as slot', async ({ mount }) => {
-  const component = await mount(<DefaultSlot>
-    <Button title="Submit" />
-  </DefaultSlot>)
-  await expect(component).toContainText('Submit')
-});
-
-test('render a component with multiple slots', async ({ mount }) => {
-  const component = await mount(<DefaultSlot>
-    <div id="one">One</div>
-    <div id="two">Two</div>
-  </DefaultSlot>)
-  await expect(component.locator('#one')).toContainText('One')
-  await expect(component.locator('#two')).toContainText('Two')
-})
-
-test('render a component with a named slot', async ({ mount }) => {
-  const component = await mount(<NamedSlots>
-    <template v-slot:header>
-      Header
-    </template>
-    <template v-slot:main>
-      Main Content
-    </template>
-    <template v-slot:footer>
-      Footer
-    </template>
-  </NamedSlots>);
-  await expect(component).toContainText('Header')
-  await expect(component).toContainText('Main Content')
-  await expect(component).toContainText('Footer')
-})
-
-test('emit a event when a slot is clicked', async ({ mount }) => {
-  let clickFired = false;
-  const component = await mount(<DefaultSlot>
-    <span v-on:click={() => clickFired = true}>Main Content</span>
-  </DefaultSlot>);
-  await component.locator('text=Main Content').click();
-  expect(clickFired).toBeTruthy();
-})
-
-test('run hooks', async ({ page, mount }) => {
-  const messages: string[] = []
-  page.on('console', m => messages.push(m.text()))
-  await mount<HooksConfig>(<Button title="Submit" />, {
-    hooksConfig: { route: 'A' }
-  })
-  expect(messages).toEqual(['Before mount: {\"route\":\"A\"}', 'After mount el: HTMLButtonElement'])
-})
-
-test('unmount', async ({ page, mount }) => {
-  const component = await mount(<Button title="Submit" />)
-  await expect(page.locator('#root')).toContainText('Submit')
-  await component.unmount();
-  await expect(page.locator('#root')).not.toContainText('Submit');
-})
-
-test('get textContent of the empty template', async ({ mount }) => {
-  const component = await mount(<EmptyTemplate />);
-  expect(await component.allTextContents()).toEqual(['']);
-  expect(await component.textContent()).toBe('');
-  await expect(component).toHaveText('');
-});
-
-test('navigate to a page by clicking a link', async ({ page, mount }) => {
-  const component = await mount(<App />, {
-    hooksConfig: { routing: true }
-  });
-  await expect(component.getByRole('main')).toHaveText('Login');
-  await expect(page).toHaveURL('/');
-  await component.getByRole('link', { name: 'Dashboard' }).click();
-  await expect(component.getByRole('main')).toHaveText('Dashboard');
-  await expect(page).toHaveURL('/dashboard');
-});
diff --git a/tests/components/ct-vue2-cli/src/notation-vue.spec.ts b/tests/components/ct-vue2-cli/src/notation-vue.spec.ts
deleted file mode 100644
index dd09a152bb..0000000000
--- a/tests/components/ct-vue2-cli/src/notation-vue.spec.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import App from './App.vue';
-import Button from './components/Button.vue';
-import Counter from './components/Counter.vue';
-import DefaultSlot from './components/DefaultSlot.vue';
-import NamedSlots from './components/NamedSlots.vue';
-import Component from './components/Component.vue';
-import EmptyTemplate from './components/EmptyTemplate.vue';
-import type { HooksConfig } from '../playwright';
-
-test.use({ viewport: { width: 500, height: 500 } })
-
-test('render props', async ({ page, mount }) => {
-  const component = await mount(Button, {
-    props: {
-      title: 'Submit'
-    }
-  })
-  await expect(component).toContainText('Submit')
-})
-
-test('update props without remounting', async ({ mount }) => {
-  const component = await mount(Counter, {
-    props: { count: 9001 }
-  })
-  await expect(component.locator('#props')).toContainText('9001')
-
-  await component.update({
-    props: { count: 1337 }
-  })
-  await expect(component).not.toContainText('9001')
-  await expect(component.locator('#props')).toContainText('1337')
-
-  await expect(component.locator('#remount-count')).toContainText('1')
-})
-
-test('update event listeners without remounting', async ({ mount }) => {
-  const component = await mount(Counter)
-
-  const messages: string[] = []
-  await component.update({
-    on: { 
-      submit: (data: string) => messages.push(data)
-    }
-  })
-  await component.click();
-  expect(messages).toEqual(['hello'])
-  
-  await expect(component.locator('#remount-count')).toContainText('1')
-})
-
-test('update slots without remounting', async ({ mount }) => {
-  const component = await mount(Counter, {
-    slots: { default: 'Default Slot' }
-  })
-  await expect(component).toContainText('Default Slot')
-
-  await component.update({
-    slots: { main: 'Test Slot' }
-  })
-  await expect(component).not.toContainText('Default Slot')
-  await expect(component).toContainText('Test Slot')
-
-  await component.update({
-    slots: { default: 'Default Slot' }
-  })
-  await expect(component).toContainText('Default Slot')
-
-
-  await expect(component.locator('#remount-count')).toContainText('1')
-})
-
-test('emit an submit event when the button is clicked', async ({ mount }) => {
-  const messages: string[] = []
-  const component = await mount(Button, {
-    props: {
-      title: 'Submit'
-    },
-    on: {
-      submit: (data: string) => messages.push(data)
-    }
-  })
-  await component.click()
-  expect(messages).toEqual(['hello'])
-})
-
-test('render a default slot', async ({ mount }) => {
-  const component = await mount(DefaultSlot, {
-    slots: {
-      default: 'Main Content'
-    }
-  })
-  await expect(component).toContainText('Main Content')
-})
-
-test('render a component with multiple slots', async ({ mount }) => {
-  const component = await mount(DefaultSlot, {
-    slots: {
-      default: ['one', 'two']
-    }
-  })
-  await expect(component).toContainText('one')
-  await expect(component).toContainText('two')
-})
-
-test('render a component with a named slot', async ({ mount }) => {
-  const component = await mount(NamedSlots, {
-    slots: {
-      header: 'Header',
-      main: 'Main Content',
-      footer: 'Footer'
-    }
-  })
-  await expect(component).toContainText('Header')
-  await expect(component).toContainText('Main Content')
-  await expect(component).toContainText('Footer')
-})
-
-test('render a component without options', async ({ mount }) => {
-  const component = await mount(Component)
-  await expect(component).toContainText('test')
-})
-
-test('run hooks', async ({ page, mount }) => {
-  const messages: string[] = []
-  page.on('console', m => messages.push(m.text()))
-  await mount<HooksConfig>(Button, {
-    props: {
-      title: 'Submit'
-    },
-    hooksConfig: { route: 'A' }
-  })
-  expect(messages).toEqual(['Before mount: {\"route\":\"A\"}', 'After mount el: HTMLButtonElement'])
-})
-
-test('unmount', async ({ page, mount }) => {
-  const component = await mount(Button, {
-    props: {
-      title: 'Submit'
-    }
-  })
-  await expect(page.locator('#root')).toContainText('Submit')
-  await component.unmount();
-  await expect(page.locator('#root')).not.toContainText('Submit');
-});
-
-test('get textContent of the empty template', async ({ mount }) => {
-  const component = await mount(EmptyTemplate);
-  expect(await component.allTextContents()).toEqual(['']);
-  expect(await component.textContent()).toBe('');
-  await expect(component).toHaveText('');
-});
-
-test('navigate to a page by clicking a link', async ({ page, mount }) => {
-  const component = await mount(App, {
-    hooksConfig: { routing: true }
-  });
-  await expect(component.getByRole('main')).toHaveText('Login');
-  await expect(page).toHaveURL('/');
-  await component.getByRole('link', { name: 'Dashboard' }).click();
-  await expect(component.getByRole('main')).toHaveText('Dashboard');
-  await expect(page).toHaveURL('/dashboard');
-});
diff --git a/tests/components/ct-vue2-cli/tests/events/events.spec.ts b/tests/components/ct-vue2-cli/tests/events/events.spec.ts
new file mode 100644
index 0000000000..71c4c958a9
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/events/events.spec.ts
@@ -0,0 +1,16 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import Button from '@/components/Button.vue';
+
+test('emit an submit event when the button is clicked', async ({ mount }) => {
+  const messages: string[] = [];
+  const component = await mount(Button, {
+    props: {
+      title: 'Submit',
+    },
+    on: {
+      submit: (data: string) => messages.push(data),
+    },
+  });
+  await component.click();
+  expect(messages).toEqual(['hello']);
+});
diff --git a/tests/components/ct-vue2-cli/tests/events/events.spec.tsx b/tests/components/ct-vue2-cli/tests/events/events.spec.tsx
new file mode 100644
index 0000000000..cdac7c704b
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/events/events.spec.tsx
@@ -0,0 +1,28 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import Button from '@/components/Button.vue';
+import DefaultSlot from '@/components/DefaultSlot.vue';
+
+test('emit an submit event when the button is clicked', async ({ mount }) => {
+  const messages: string[] = [];
+  const component = await mount(
+    <Button
+      title="Submit"
+      v-on:submit={(data: string) => {
+        messages.push(data);
+      }}
+    />
+  );
+  await component.click();
+  expect(messages).toEqual(['hello']);
+});
+
+test('emit a event when a slot is clicked', async ({ mount }) => {
+  let clickFired = false;
+  const component = await mount(
+    <DefaultSlot>
+      <span v-on:click={() => (clickFired = true)}>Main Content</span>
+    </DefaultSlot>
+  );
+  await component.locator('text=Main Content').click();
+  expect(clickFired).toBeTruthy();
+});
diff --git a/tests/components/ct-vue2-cli/tests/render/render.spec.ts b/tests/components/ct-vue2-cli/tests/render/render.spec.ts
new file mode 100644
index 0000000000..dcb3284f3c
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/render/render.spec.ts
@@ -0,0 +1,25 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import Button from '@/components/Button.vue';
+import Component from '@/components/Component.vue';
+import EmptyTemplate from '@/components/EmptyTemplate.vue';
+
+test('render props', async ({ mount }) => {
+  const component = await mount(Button, {
+    props: {
+      title: 'Submit',
+    },
+  });
+  await expect(component).toContainText('Submit');
+});
+
+test('render a component without options', async ({ mount }) => {
+  const component = await mount(Component);
+  await expect(component).toContainText('test');
+});
+
+test('get textContent of the empty template', async ({ mount }) => {
+  const component = await mount(EmptyTemplate);
+  expect(await component.allTextContents()).toEqual(['']);
+  expect(await component.textContent()).toBe('');
+  await expect(component).toHaveText('');
+});
diff --git a/tests/components/ct-vue2-cli/tests/render/render.spec.tsx b/tests/components/ct-vue2-cli/tests/render/render.spec.tsx
new file mode 100644
index 0000000000..42307ff8f6
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/render/render.spec.tsx
@@ -0,0 +1,20 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import Button from '@/components/Button.vue';
+import EmptyTemplate from '@/components/EmptyTemplate.vue';
+
+test('render props', async ({ mount }) => {
+  const component = await mount(<Button title="Submit" />);
+  await expect(component).toContainText('Submit');
+});
+
+test('render attributes', async ({ mount }) => {
+  const component = await mount(<Button class="primary" title="Submit" />);
+  await expect(component).toHaveClass('primary');
+});
+
+test('get textContent of the empty template', async ({ mount }) => {
+  const component = await mount(<EmptyTemplate />);
+  expect(await component.allTextContents()).toEqual(['']);
+  expect(await component.textContent()).toBe('');
+  await expect(component).toHaveText('');
+});
diff --git a/tests/components/ct-vue2-cli/tests/slots/slots.spec.ts b/tests/components/ct-vue2-cli/tests/slots/slots.spec.ts
new file mode 100644
index 0000000000..afc1210074
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/slots/slots.spec.ts
@@ -0,0 +1,35 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import DefaultSlot from '@/components/DefaultSlot.vue';
+import NamedSlots from '@/components/NamedSlots.vue';
+
+test('render a default slot', async ({ mount }) => {
+  const component = await mount(DefaultSlot, {
+    slots: {
+      default: 'Main Content',
+    },
+  });
+  await expect(component).toContainText('Main Content');
+});
+
+test('render a component with multiple slots', async ({ mount }) => {
+  const component = await mount(DefaultSlot, {
+    slots: {
+      default: ['one', 'two'],
+    },
+  });
+  await expect(component).toContainText('one');
+  await expect(component).toContainText('two');
+});
+
+test('render a component with a named slot', async ({ mount }) => {
+  const component = await mount(NamedSlots, {
+    slots: {
+      header: 'Header',
+      main: 'Main Content',
+      footer: 'Footer',
+    },
+  });
+  await expect(component).toContainText('Header');
+  await expect(component).toContainText('Main Content');
+  await expect(component).toContainText('Footer');
+});
diff --git a/tests/components/ct-vue2-cli/tests/slots/slots.spec.tsx b/tests/components/ct-vue2-cli/tests/slots/slots.spec.tsx
new file mode 100644
index 0000000000..a4e2ea6c6a
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/slots/slots.spec.tsx
@@ -0,0 +1,42 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import Button from '@/components/Button.vue';
+import DefaultSlot from '@/components/DefaultSlot.vue';
+import NamedSlots from '@/components/NamedSlots.vue';
+
+test('render a default slot', async ({ mount }) => {
+  const component = await mount(<DefaultSlot>Main Content</DefaultSlot>);
+  await expect(component).toContainText('Main Content');
+});
+
+test('render a component as slot', async ({ mount }) => {
+  const component = await mount(
+    <DefaultSlot>
+      <Button title="Submit" />
+    </DefaultSlot>
+  );
+  await expect(component).toContainText('Submit');
+});
+
+test('render a component with multiple slots', async ({ mount }) => {
+  const component = await mount(
+    <DefaultSlot>
+      <div id="one">One</div>
+      <div id="two">Two</div>
+    </DefaultSlot>
+  );
+  await expect(component.locator('#one')).toContainText('One');
+  await expect(component.locator('#two')).toContainText('Two');
+});
+
+test('render a component with a named slot', async ({ mount }) => {
+  const component = await mount(
+    <NamedSlots>
+      <template v-slot:header>Header</template>
+      <template v-slot:main>Main Content</template>
+      <template v-slot:footer>Footer</template>
+    </NamedSlots>
+  );
+  await expect(component).toContainText('Header');
+  await expect(component).toContainText('Main Content');
+  await expect(component).toContainText('Footer');
+});
diff --git a/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.ts b/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.ts
new file mode 100644
index 0000000000..b4a21341d8
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.ts
@@ -0,0 +1,13 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import Button from '@/components/Button.vue';
+
+test('unmount', async ({ page, mount }) => {
+  const component = await mount(Button, {
+    props: {
+      title: 'Submit',
+    },
+  });
+  await expect(page.locator('#root')).toContainText('Submit');
+  await component.unmount();
+  await expect(page.locator('#root')).not.toContainText('Submit');
+});
diff --git a/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.tsx b/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.tsx
new file mode 100644
index 0000000000..ece46931fa
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.tsx
@@ -0,0 +1,9 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import Button from '@/components/Button.vue';
+
+test('unmount', async ({ page, mount }) => {
+  const component = await mount(<Button title="Submit" />);
+  await expect(page.locator('#root')).toContainText('Submit');
+  await component.unmount();
+  await expect(page.locator('#root')).not.toContainText('Submit');
+});
diff --git a/tests/components/ct-vue2-cli/tests/update/update.spec.ts b/tests/components/ct-vue2-cli/tests/update/update.spec.ts
new file mode 100644
index 0000000000..a1ceffe09d
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/update/update.spec.ts
@@ -0,0 +1,52 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import Counter from '@/components/Counter.vue';
+
+test('update props without remounting', async ({ mount }) => {
+  const component = await mount(Counter, {
+    props: { count: 9001 },
+  });
+  await expect(component.locator('#props')).toContainText('9001');
+
+  await component.update({
+    props: { count: 1337 },
+  });
+  await expect(component).not.toContainText('9001');
+  await expect(component.locator('#props')).toContainText('1337');
+
+  await expect(component.locator('#remount-count')).toContainText('1');
+});
+
+test('update event listeners without remounting', async ({ mount }) => {
+  const component = await mount(Counter);
+
+  const messages: string[] = [];
+  await component.update({
+    on: {
+      submit: (data: string) => messages.push(data),
+    },
+  });
+  await component.click();
+  expect(messages).toEqual(['hello']);
+
+  await expect(component.locator('#remount-count')).toContainText('1');
+});
+
+test('update slots without remounting', async ({ mount }) => {
+  const component = await mount(Counter, {
+    slots: { default: 'Default Slot' },
+  });
+  await expect(component).toContainText('Default Slot');
+
+  await component.update({
+    slots: { main: 'Test Slot' },
+  });
+  await expect(component).not.toContainText('Default Slot');
+  await expect(component).toContainText('Test Slot');
+
+  await component.update({
+    slots: { default: 'Default Slot' },
+  });
+  await expect(component).toContainText('Default Slot');
+
+  await expect(component.locator('#remount-count')).toContainText('1');
+});
diff --git a/tests/components/ct-vue2-cli/tests/update/update.spec.tsx b/tests/components/ct-vue2-cli/tests/update/update.spec.tsx
new file mode 100644
index 0000000000..9e14504ee6
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/update/update.spec.tsx
@@ -0,0 +1,45 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import Counter from '@/components/Counter.vue';
+
+test('update props without remounting', async ({ mount }) => {
+  const component = await mount(<Counter count={9001} />);
+  await expect(component.locator('#props')).toContainText('9001');
+
+  await component.update(<Counter count={1337} />);
+  await expect(component).not.toContainText('9001');
+  await expect(component.locator('#props')).toContainText('1337');
+
+  await expect(component.locator('#remount-count')).toContainText('1');
+});
+
+test('update event listeners without remounting', async ({ mount }) => {
+  const messages: string[] = [];
+  const component = await mount(<Counter />);
+
+  await component.update(
+    <Counter
+      v-on:submit={(count: string) => {
+        messages.push(count);
+      }}
+    />
+  );
+  await component.click();
+  expect(messages).toEqual(['hello']);
+
+  await expect(component.locator('#remount-count')).toContainText('1');
+});
+
+test('update slots without remounting', async ({ mount }) => {
+  const component = await mount(<Counter>Default Slot</Counter>);
+  await expect(component).toContainText('Default Slot');
+
+  await component.update(
+    <Counter>
+      <template v-slot:main>Test Slot</template>
+    </Counter>
+  );
+  await expect(component).not.toContainText('Default Slot');
+  await expect(component).toContainText('Test Slot');
+
+  await expect(component.locator('#remount-count')).toContainText('1');
+});
diff --git a/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.ts b/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.ts
new file mode 100644
index 0000000000..53615f8f01
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.ts
@@ -0,0 +1,13 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import App from '@/App.vue';
+
+test('navigate to a page by clicking a link', async ({ page, mount }) => {
+  const component = await mount(App, {
+    hooksConfig: { routing: true },
+  });
+  await expect(component.getByRole('main')).toHaveText('Login');
+  await expect(page).toHaveURL('/');
+  await component.getByRole('link', { name: 'Dashboard' }).click();
+  await expect(component.getByRole('main')).toHaveText('Dashboard');
+  await expect(page).toHaveURL('/dashboard');
+});
diff --git a/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.tsx b/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.tsx
new file mode 100644
index 0000000000..1a6ac3a2a1
--- /dev/null
+++ b/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.tsx
@@ -0,0 +1,13 @@
+import { test, expect } from '@playwright/experimental-ct-vue2';
+import App from '@/App.vue';
+
+test('navigate to a page by clicking a link', async ({ page, mount }) => {
+  const component = await mount(<App />, {
+    hooksConfig: { routing: true },
+  });
+  await expect(component.getByRole('main')).toHaveText('Login');
+  await expect(page).toHaveURL('/');
+  await component.getByRole('link', { name: 'Dashboard' }).click();
+  await expect(component.getByRole('main')).toHaveText('Dashboard');
+  await expect(page).toHaveURL('/dashboard');
+});
diff --git a/tests/components/ct-vue2-cli/tsconfig.app.json b/tests/components/ct-vue2-cli/tsconfig.app.json
index 326d9a3552..40ad6e32b2 100644
--- a/tests/components/ct-vue2-cli/tsconfig.app.json
+++ b/tests/components/ct-vue2-cli/tsconfig.app.json
@@ -1,12 +1,11 @@
 {
   "extends": "@vue/tsconfig/tsconfig.web.json",
   "include": ["src/**/*", "src/**/*.vue"],
-  "exclude": ["src/**/*.spec.*/*"],
   "compilerOptions": {
     "composite": true,
     "baseUrl": ".",
     "paths": {
-    "@/*": ["./src/*"]
+      "@/*": ["./src/*"]
     }
   }
 }
diff --git a/tests/components/ct-vue2-cli/tsconfig.test.json b/tests/components/ct-vue2-cli/tsconfig.test.json
index 4e2171c031..9b93a78c8c 100644
--- a/tests/components/ct-vue2-cli/tsconfig.test.json
+++ b/tests/components/ct-vue2-cli/tsconfig.test.json
@@ -1,6 +1,6 @@
 {
   "extends": "./tsconfig.app.json",
-  "include": ["playwright", "src/**/*"],
+  "include": ["tests/**/*", "src/shims-vue.d.ts"],
   "compilerOptions": {
     "allowJs": true,
     "composite": true,
