diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fffe2de4e9..7baf1f64e9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -750,6 +750,9 @@ jobs:
           tests/boundary/providers/native/artifactProvider.extractionCompleteness.test.ts
           tests/boundary/filesystem/setupUnavailableProvider.test.ts
           tests/boundary/filesystem/windowsNpxRegistration.test.ts
+          tests/boundary/filesystem/clientConfigurationEnvironment.test.ts
+          tests/boundary/filesystem/clientConfigurationLayeredEnvironment.test.ts
+          tests/acceptance/setup/registrationRuntimeEnvironmentCli.test.ts
           tests/boundary/android/workspaceGuardianRetry.test.ts
           tests/acceptance/setup/homeDirectoryFallback.test.ts
           tests/boundary/filesystem/javascriptApplicationWorkflows.test.ts
diff --git a/scripts/ci/scopes.mjs b/scripts/ci/scopes.mjs
index fcb4a0dab0..32a15faaa3 100644
--- a/scripts/ci/scopes.mjs
+++ b/scripts/ci/scopes.mjs
@@ -130,6 +130,9 @@ export const SCOPES = {
     "src/config/**",
     "src/application/Setup*.ts",
     "src/application/Uninstall*.ts",
+    "src/application/ClientConfiguration*.ts",
+    "src/application/ClientRegistration*.ts",
+    "src/application/DshCordis*.ts",
     "src/cli/interactiveSetup.ts",
     "src/cli/setupCommands.ts",
     "tests/boundary/filesystem/binaryTarget.test.ts",
@@ -138,6 +141,9 @@ export const SCOPES = {
     "tests/boundary/providers/native/artifactProvider.extractionCompleteness.test.ts",
     "tests/boundary/filesystem/setupUnavailableProvider.test.ts",
     "tests/boundary/filesystem/windowsNpxRegistration.test.ts",
+    "tests/boundary/filesystem/clientConfigurationEnvironment.test.ts",
+    "tests/boundary/filesystem/clientConfigurationLayeredEnvironment.test.ts",
+    "tests/acceptance/setup/registrationRuntimeEnvironmentCli.test.ts",
     "tests/boundary/android/workspaceGuardianRetry.test.ts",
     "src/android/JadxWorkspaceRoot.ts",
     "scripts/rea-android-workspace-guardian.mjs",
diff --git a/tests/boundary/filesystem/ciChangeScope.test.ts b/tests/boundary/filesystem/ciChangeScope.test.ts
index 874b4ade29..395a597c7d 100644
--- a/tests/boundary/filesystem/ciChangeScope.test.ts
+++ b/tests/boundary/filesystem/ciChangeScope.test.ts
@@ -724,6 +724,54 @@ it.each([
     "tests/boundary/filesystem/windowsNpxRegistration.test.ts",
     { code: true, package: true, runtime: true, apple: false },
   ],
+  [
+    "tests/boundary/filesystem/clientConfigurationEnvironment.test.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
+  [
+    "tests/boundary/filesystem/clientConfigurationLayeredEnvironment.test.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
+  [
+    "tests/acceptance/setup/registrationRuntimeEnvironmentCli.test.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
+  [
+    "src/application/ClientRegistrationEnvironment.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
+  [
+    "src/application/ClientRegistrationStatus.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
+  [
+    "src/application/ClientRegistrationIdentity.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
+  [
+    "src/application/ClientConfigurationDocument.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
+  [
+    "src/application/ClientConfigurationFiles.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
+  [
+    "src/application/ClientConfigurationPublication.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
+  [
+    "src/application/ClientConfigurationCleanup.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
+  [
+    "src/application/DshCordisPatch.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
+  [
+    "src/application/DshCordisYaml.ts",
+    { code: true, package: true, runtime: true, apple: false },
+  ],
   [
     "scripts/verify-packed-bridge.mjs",
     {
diff --git a/tests/process-global/curatedWindowsLane.test.ts b/tests/process-global/curatedWindowsLane.test.ts
index c486b7a248..637ca8d23a 100644
--- a/tests/process-global/curatedWindowsLane.test.ts
+++ b/tests/process-global/curatedWindowsLane.test.ts
@@ -83,6 +83,16 @@ describe("curated Windows test lane", () => {
     );
   });
 
+  it("keeps Windows environment identity and layered setup regressions in the lane", async () => {
+    expect(await explicitPaths("windows")).toEqual(
+      expect.arrayContaining([
+        "tests/boundary/filesystem/clientConfigurationEnvironment.test.ts",
+        "tests/boundary/filesystem/clientConfigurationLayeredEnvironment.test.ts",
+        "tests/acceptance/setup/registrationRuntimeEnvironmentCli.test.ts",
+      ]),
+    );
+  });
+
   it("keeps packed bridge verification under the retained native runtime lease in the lane", async () => {
     expect(await explicitPaths("windows")).toContain(
       "tests/boundary/process/packedBridgeVerification.test.ts",