diff --git a/bazel/envoy_test.bzl b/bazel/envoy_test.bzl
index 799e60154afc5..0cd48ba286200 100644
--- a/bazel/envoy_test.bzl
+++ b/bazel/envoy_test.bzl
@@ -169,10 +169,12 @@ def envoy_cc_test(
         linkstatic = envoy_linkstatic(),
         malloc = tcmalloc_external_dep(repository),
         deps = envoy_stdlib_deps() + deps + [envoy_external_dep_path(dep) for dep in external_deps + ["googletest"]] + [
-            repository + "//test:test_pch",
             repository + "//test:main",
             repository + "//test/test_common:test_version_linkstamp",
-        ],
+        ] + select({
+            repository + "//bazel:clang_pch_build": [repository + "//test:test_pch"],
+            "//conditions:default": [],
+        }),
         # from https://github.com/google/googletest/blob/6e1970e2376c14bf658eb88f655a054030353f9f/googlemock/src/gmock.cc#L51
         # 2 - by default, mocks act as StrictMocks.
         args = args + ["--gmock_default_mock_behavior=2"],
diff --git a/test/extensions/common/dynamic_forward_proxy/BUILD b/test/extensions/common/dynamic_forward_proxy/BUILD
index d9101e6f94a5e..8c3f5bd309bf4 100644
--- a/test/extensions/common/dynamic_forward_proxy/BUILD
+++ b/test/extensions/common/dynamic_forward_proxy/BUILD
@@ -19,6 +19,7 @@ envoy_cc_test(
         "//source/extensions/common/dynamic_forward_proxy:dns_cache_manager_impl",
         "//test/mocks/network:network_mocks",
         "//test/mocks/runtime:runtime_mocks",
+        "//test/mocks/server:factory_context_mocks",
         "//test/mocks/thread_local:thread_local_mocks",
         "//test/test_common:registry_lib",
         "//test/test_common:simulated_time_system_lib",
diff --git a/test/extensions/filters/network/ratelimit/BUILD b/test/extensions/filters/network/ratelimit/BUILD
index f4a3ac2fa52e3..ea09ac87dbb32 100644
--- a/test/extensions/filters/network/ratelimit/BUILD
+++ b/test/extensions/filters/network/ratelimit/BUILD
@@ -29,6 +29,7 @@ envoy_extension_cc_test(
         "//test/mocks/network:network_mocks",
         "//test/mocks/ratelimit:ratelimit_mocks",
         "//test/mocks/runtime:runtime_mocks",
+        "//test/mocks/server:factory_context_mocks",
         "//test/mocks/stream_info:stream_info_mocks",
         "//test/mocks/tracing:tracing_mocks",
         "@envoy_api//envoy/extensions/filters/network/ratelimit/v3:pkg_cc_proto",
diff --git a/test/per_file_coverage.sh b/test/per_file_coverage.sh
index 5672743306e1a..8a0d0a0e520ce 100755
--- a/test/per_file_coverage.sh
+++ b/test/per_file_coverage.sh
@@ -3,30 +3,33 @@
 # directory:coverage_percent
 # for existing directories with low coverage.
 declare -a KNOWN_LOW_COVERAGE=(
-"source/common:96.1" # Raise when QUIC coverage goes up
+"source/common:96.0" # Raise when QUIC coverage goes up
 "source/common/api:79.8"
 "source/common/api/posix:78.5"
 "source/common/common/posix:92.7"
+"source/common/config:96.5"
 "source/common/config/xds_mux:94.5"
 "source/common/crypto:0.0"
 "source/common/event:94.1" # Emulated edge events guards don't report LCOV
 "source/common/filesystem/posix:95.5"
-"source/common/http:96.5"
+"source/common/http:96.3"
+"source/common/http/http2:96.4"
 "source/common/json:90.1"
 "source/common/matcher:94.2"
 "source/common/network:94.8" # Flaky, `activateFileEvents`, `startSecureTransport` and `ioctl` do not always report LCOV
 "source/common/protobuf:95.3"
 "source/common/quic:91.8"
-"source/common/secret:96.3"
+"source/common/router:96.5"
+"source/common/secret:94.9"
 "source/common/signal:86.9" # Death tests don't report LCOV
 "source/common/singleton:95.7"
 "source/common/tcp:94.6"
 "source/common/thread:0.0" # Death tests don't report LCOV
 "source/common/tracing:96.1"
-"source/common/upstream:96.5"
+"source/common/upstream:96.2"
 "source/common/watchdog:58.6" # Death tests don't report LCOV
 "source/exe:92.6"
-"source/extensions/common:96.0"
+"source/extensions/common:95.9"
 "source/extensions/common/tap:94.2"
 "source/extensions/common/wasm:95.3" # flaky: be careful adjusting
 "source/extensions/common/wasm/ext:92.0"
@@ -66,8 +69,8 @@ declare -a KNOWN_LOW_COVERAGE=(
 "source/extensions/tracers/opencensus:94.8"
 "source/extensions/tracers/xray:96.2"
 "source/extensions/tracers/zipkin:96.1"
-"source/extensions/transport_sockets:95.4"
-"source/extensions/transport_sockets/tls:94.6"
+"source/extensions/transport_sockets:95.3"
+"source/extensions/transport_sockets/tls:94.5"
 "source/extensions/transport_sockets/tls/cert_validator:96.0"
 "source/extensions/transport_sockets/tls/ocsp:96.5"
 "source/extensions/transport_sockets/tls/private_key:77.8"