diff --git a/scripts/split-e2e-tests-v2.ts b/scripts/split-e2e-tests-v2.ts
index 96884aa9cb1..49a1d9a99c7 100644
--- a/scripts/split-e2e-tests-v2.ts
+++ b/scripts/split-e2e-tests-v2.ts
@@ -103,37 +103,23 @@ const TEST_EXCLUSIONS: { l: string[]; w: string[] } = {
   w: [
     'src/__tests__/opensearch-simulator/opensearch-simulator.test.ts',
     'src/__tests__/storage-simulator/S3server.test.ts',
-    'src/__tests__/dynamodb-simulator/dynamodb-simulator.test.ts',
     'src/__tests__/amplify-app.test.ts',
-    'src/__tests__/analytics-2.test.ts',
-    'src/__tests__/api_2a.test.ts',
-    'src/__tests__/api_2b.test.ts',
-    'src/__tests__/api_3.test.ts',
-    'src/__tests__/api_5.test.ts',
-    'src/__tests__/custom_policies_container.test.ts',
     // TODO: this is required to jump over breaking change between 2.53 and 2.68 of CDK.
     // Remove exclusion for both custom resource tests after we ship new extensibility helper.
     'src/__tests__/custom_resources.test.ts',
     'src/__tests__/custom-resource-with-storage.test.ts',
     'src/__tests__/datastore-modelgen.test.ts',
-    'src/__tests__/delete.test.ts',
     'src/__tests__/diagnose.test.ts',
     'src/__tests__/env-2.test.ts',
-    'src/__tests__/env-3.test.ts',
     'src/__tests__/export.test.ts',
-    'src/__tests__/function_1.test.ts',
-    'src/__tests__/function_2a.test.ts',
-    'src/__tests__/function_2b.test.ts',
     'src/__tests__/function_3a.test.ts',
     'src/__tests__/function_3b.test.ts',
     'src/__tests__/function_4.test.ts',
     'src/__tests__/function_6.test.ts',
     'src/__tests__/function_7.test.ts',
     'src/__tests__/function_8.test.ts',
-    'src/__tests__/geo-add-c.test.ts',
     'src/__tests__/geo-add-e.test.ts',
     'src/__tests__/geo-add-f.test.ts',
-    'src/__tests__/geo-remove-1.test.ts',
     'src/__tests__/geo-remove-2.test.ts',
     'src/__tests__/geo-remove-3.test.ts',
     'src/__tests__/geo-update-1.test.ts',
@@ -148,34 +134,15 @@ const TEST_EXCLUSIONS: { l: string[]; w: string[] } = {
     'src/__tests__/import_dynamodb_2a.test.ts',
     'src/__tests__/import_dynamodb_2b.test.ts',
     'src/__tests__/import_dynamodb_2c.test.ts',
-    'src/__tests__/import_s3_1.test.ts',
     'src/__tests__/import_s3_2a.test.ts',
     'src/__tests__/import_s3_2b.test.ts',
     'src/__tests__/import_s3_2c.test.ts',
     'src/__tests__/layer-2.test.ts',
     'src/__tests__/mock-api.test.ts',
-    'src/__tests__/notifications-analytics-compatibility-in-app-1.test.ts',
-    'src/__tests__/notifications-analytics-compatibility-sms-1.test.ts',
-    'src/__tests__/notifications-analytics-compatibility-sms-2.test.ts',
-    'src/__tests__/notifications-in-app-messaging-env-1.test.ts',
-    'src/__tests__/notifications-in-app-messaging-env-2.test.ts',
-    'src/__tests__/notifications-lifecycle.test.ts',
-    'src/__tests__/notifications-sms-pull.test.ts',
-    'src/__tests__/notifications-sms.test.ts',
     'src/__tests__/pull.test.ts',
-    'src/__tests__/schema-auth-11-a.test.ts',
-    'src/__tests__/schema-auth-15.test.ts',
-    'src/__tests__/schema-auth-9-a.test.ts',
-    'src/__tests__/schema-auth-9-b.test.ts',
-    'src/__tests__/schema-auth-9-c.test.ts',
     'src/__tests__/schema-iterative-rollback-1.test.ts',
     'src/__tests__/schema-iterative-rollback-2.test.ts',
-    'src/__tests__/storage-2.test.ts',
     'src/__tests__/storage-5.test.ts',
-    'src/__tests__/studio-modelgen.test.ts',
-    'src/__tests__/transformer-migrations/http-migration.test.ts',
-    'src/__tests__/transformer-migrations/model-migration.test.ts',
-    'src/__tests__/transformer-migrations/searchable-migration.test.ts',
     'src/__tests__/uibuilder.test.ts',
     'src/__tests__/pinpoint/android-analytics-pinpoint-config.test.ts',
     'src/__tests__/pinpoint/android-notifications-pinpoint-config.test.ts',
@@ -255,7 +222,9 @@ export const splitTestsV2 = function splitTests(
       }
       // when we are not running E2E on 'dev', we only run a subset of tests on Windows
       const isNotDevBranch = process.env.CIRCLE_BRANCH !== 'dev';
-      if (isNotDevBranch && os === 'w' && !WINDOWS_SMOKE_TESTS.includes(test)) {
+      const shouldForceAllTests = process.env.CIRCLE_BRANCH?.endsWith('/run-all-tests') ?? false;
+      const shouldFilterWindowsTests = isNotDevBranch && !shouldForceAllTests;
+      if (shouldFilterWindowsTests && os === 'w' && !WINDOWS_SMOKE_TESTS.includes(test)) {
         continue; // skip this test
       }
       const US_WEST_2 = FORCE_US_WEST_2.find((t) => test.startsWith(t));