diff --git a/.github/workflows/rust-ci-full-nextest-platform.yml b/.github/workflows/rust-ci-full-nextest-platform.yml
index 49896af009..8056f31680 100644
--- a/.github/workflows/rust-ci-full-nextest-platform.yml
+++ b/.github/workflows/rust-ci-full-nextest-platform.yml
@@ -419,7 +419,7 @@ jobs:
                 --workspace-remap "${workspace_root}" \
                 --filterset "${NEXTEST_FILTERSET}" \
                 --message-format json |
-                python3 -c 'import json, sys; print(json.load(sys.stdin)["test-count"])'
+                python3 -c 'import json, sys; test_list = json.load(sys.stdin); print(sum(testcase["filter-match"]["status"] == "matches" for suite in test_list["rust-suites"].values() for testcase in suite["testcases"].values()))'
             )"
             if [[ "${test_count}" != "1" ]]; then
               echo "nextest filterset must resolve to exactly one test; got ${test_count}" >&2
diff --git a/.github/workflows/rust-ci-full-targeted-test.yml b/.github/workflows/rust-ci-full-targeted-test.yml
index 8b04336e4b..76c93a436f 100644
--- a/.github/workflows/rust-ci-full-targeted-test.yml
+++ b/.github/workflows/rust-ci-full-targeted-test.yml
@@ -32,7 +32,7 @@ jobs:
       profile: ci-test
       artifact_id: targeted-macos-aarch64
       use_sccache: true
-      nextest_filterset: ${{ github.event_name == 'workflow_dispatch' && inputs.nextest_filterset || 'test(=user_shell_commands_do_not_inherit_managed_network_proxy)' }}
+      nextest_filterset: ${{ github.event_name == 'workflow_dispatch' && inputs.nextest_filterset || 'test(=session::tests::user_shell_commands_do_not_inherit_managed_network_proxy)' }}
       partition_tests: false
       require_single_test: true
     secrets: inherit
@@ -50,7 +50,7 @@ jobs:
       artifact_id: targeted-linux-x64-remote
       remote_env: true
       use_sccache: true
-      nextest_filterset: ${{ github.event_name == 'workflow_dispatch' && inputs.nextest_filterset || 'test(=user_shell_commands_do_not_inherit_managed_network_proxy)' }}
+      nextest_filterset: ${{ github.event_name == 'workflow_dispatch' && inputs.nextest_filterset || 'test(=session::tests::user_shell_commands_do_not_inherit_managed_network_proxy)' }}
       partition_tests: false
       require_single_test: true
     secrets: inherit
@@ -67,7 +67,7 @@ jobs:
       profile: ci-test
       artifact_id: targeted-linux-arm64
       use_sccache: true
-      nextest_filterset: ${{ github.event_name == 'workflow_dispatch' && inputs.nextest_filterset || 'test(=user_shell_commands_do_not_inherit_managed_network_proxy)' }}
+      nextest_filterset: ${{ github.event_name == 'workflow_dispatch' && inputs.nextest_filterset || 'test(=session::tests::user_shell_commands_do_not_inherit_managed_network_proxy)' }}
       partition_tests: false
       require_single_test: true
     secrets: inherit
@@ -84,7 +84,7 @@ jobs:
       profile: ci-test
       artifact_id: targeted-windows-x64
       test_threads: 8
-      nextest_filterset: ${{ github.event_name == 'workflow_dispatch' && inputs.nextest_filterset || 'test(=user_shell_commands_do_not_inherit_managed_network_proxy)' }}
+      nextest_filterset: ${{ github.event_name == 'workflow_dispatch' && inputs.nextest_filterset || 'test(=session::tests::user_shell_commands_do_not_inherit_managed_network_proxy)' }}
       partition_tests: false
       require_single_test: true
     secrets: inherit
@@ -105,7 +105,7 @@ jobs:
       artifact_id: targeted-windows-arm64
       test_threads: 8
       use_sccache: true
-      nextest_filterset: ${{ github.event_name == 'workflow_dispatch' && inputs.nextest_filterset || 'test(=user_shell_commands_do_not_inherit_managed_network_proxy)' }}
+      nextest_filterset: ${{ github.event_name == 'workflow_dispatch' && inputs.nextest_filterset || 'test(=session::tests::user_shell_commands_do_not_inherit_managed_network_proxy)' }}
       partition_tests: false
       require_single_test: true
     secrets: inherit