diff --git a/.circleci/config.yml b/.circleci/config.yml
index 70b387f58cb5..bd2d13b2af33 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -390,7 +390,7 @@ jobs:
       parallelism:
         type: integer
     executor:
-      class: medium
+      class: large
       name: sb_playwright
     parallelism: << parameters.parallelism >>
     steps:
diff --git a/code/addons/interactions/template/stories/unhandled-errors.stories.ts b/code/addons/interactions/template/stories/unhandled-errors.stories.ts
index 336c44b72f3a..dad3ce89ce8d 100644
--- a/code/addons/interactions/template/stories/unhandled-errors.stories.ts
+++ b/code/addons/interactions/template/stories/unhandled-errors.stories.ts
@@ -13,6 +13,7 @@ export default {
     actions: { argTypesRegex: '^on[A-Z].*' },
     chromatic: { disable: true },
   },
+  tags: ['test-skip'],
 };
 
 export const Default = {
diff --git a/code/frameworks/nextjs/template/stories_nextjs-default-ts/ServerActions.stories.tsx b/code/frameworks/nextjs/template/stories_nextjs-default-ts/ServerActions.stories.tsx
index cb3f5bbdb2dd..21a911a08ac1 100644
--- a/code/frameworks/nextjs/template/stories_nextjs-default-ts/ServerActions.stories.tsx
+++ b/code/frameworks/nextjs/template/stories_nextjs-default-ts/ServerActions.stories.tsx
@@ -31,6 +31,7 @@ function Component() {
 
 export default {
   component: Component,
+  tags: ['test-skip'],
   parameters: {
     nextjs: {
       appDirectory: true,
diff --git a/code/lib/test/template/stories/loader-enhancements.stories.ts b/code/lib/test/template/stories/loader-enhancements.stories.ts
index 997b40e12644..b759a73b56c1 100644
--- a/code/lib/test/template/stories/loader-enhancements.stories.ts
+++ b/code/lib/test/template/stories/loader-enhancements.stories.ts
@@ -12,7 +12,7 @@ export default meta;
 export const canvas_is_equal_to_within_canvas_element = {
   async play({ canvas, canvasElement }) {
     const oldCanvas = within(canvasElement);
-    await expect(canvas satisfies typeof oldCanvas).toEqual(oldCanvas);
+    await expect(Object.keys(canvas)).toEqual(Object.keys(oldCanvas));
   },
 };
 
diff --git a/scripts/tasks/test-runner-build.ts b/scripts/tasks/test-runner-build.ts
index 9cecf1672120..b8249a091a49 100644
--- a/scripts/tasks/test-runner-build.ts
+++ b/scripts/tasks/test-runner-build.ts
@@ -18,6 +18,7 @@ export const testRunnerBuild: Task & { port: number } = {
       '--maxWorkers=2',
       '--failOnConsole',
       '--skipTags="test-skip"',
+      '--index-json',
     ];
 
     await exec(