diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c7172ce21..490a318c8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,7 +3,8 @@ on:
   push:
   pull_request:
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  # Group based on workflow name and PR if it exists, if no PR, let it run so carryforward flags work
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 jobs:
   tests:
diff --git a/codecov.yml b/codecov.yml
index 8b363613c..9c76afdf6 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -15,6 +15,7 @@ coverage:
 
 flag_management:
   default_rules:
+    carryforward: true
     statuses:
       - type: project
         target: auto
diff --git a/vitest.config.ts b/vitest.config.ts
index 29ea679f9..81e9cde90 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -15,6 +15,8 @@ export default defineConfig({
 				'**/*.{interface,type,d}.ts',
 				// All index files that *should* only contain exports from other files
 				'**/index.{js,ts}',
+				// All exports files that make subpackages available as submodules
+				'**/exports/*.{js,ts}',
 			],
 		},
 	},