diff --git a/test/build/BUILD b/test/build/BUILD
index affcc040..16956e8d 100644
--- a/test/build/BUILD
+++ b/test/build/BUILD
@@ -5,6 +5,8 @@ licenses(["notice"])  # Apache 2
 api_cc_test(
     name = "build_test",
     srcs = ["build_test.cc"],
+    # Workaround for https://github.com/bazelbuild/bazel/issues/13819
+    linkstatic = True,
     deps = [
         "//envoy/api/v2:pkg_cc_proto",
         "//envoy/service/accesslog/v2:pkg_cc_proto",
diff --git a/test/validate/BUILD b/test/validate/BUILD
index 79b6d6d9..3ffe2ab3 100644
--- a/test/validate/BUILD
+++ b/test/validate/BUILD
@@ -5,6 +5,8 @@ licenses(["notice"])  # Apache 2
 api_cc_test(
     name = "pgv_test",
     srcs = ["pgv_test.cc"],
+    # Workaround for https://github.com/bazelbuild/bazel/issues/13819
+    linkstatic = True,
     deps = [
         "@envoy_api//envoy/config/accesslog/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",