diff --git a/test/common/network/BUILD b/test/common/network/BUILD
index e8cf67a6b9d1..2910ffb4d878 100644
--- a/test/common/network/BUILD
+++ b/test/common/network/BUILD
@@ -278,6 +278,7 @@ envoy_cc_test(
 envoy_cc_test(
     name = "addr_family_aware_socket_option_impl_test",
     srcs = ["addr_family_aware_socket_option_impl_test.cc"],
+    tags = ["fails_on_windows"],
     deps = [
         ":socket_option_test",
         "//source/common/network:addr_family_aware_socket_option_lib",
diff --git a/test/common/router/BUILD b/test/common/router/BUILD
index 2db462fb8e03..7d88ae53b96e 100644
--- a/test/common/router/BUILD
+++ b/test/common/router/BUILD
@@ -289,6 +289,7 @@ envoy_cc_test(
     name = "router_upstream_log_test",
     srcs = ["router_upstream_log_test.cc"],
     external_deps = ["abseil_optional"],
+    tags = ["fails_on_windows"],
     deps = [
         "//source/common/buffer:buffer_lib",
         "//source/common/network:utility_lib",
diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD
index e95118222fe4..7c417471775d 100644
--- a/test/common/upstream/BUILD
+++ b/test/common/upstream/BUILD
@@ -135,6 +135,7 @@ envoy_benchmark_test(
 envoy_cc_test(
     name = "health_checker_impl_test",
     srcs = ["health_checker_impl_test.cc"],
+    tags = ["fails_on_windows"],
     deps = [
         ":utility_lib",
         "//source/common/buffer:buffer_lib",
@@ -403,6 +404,7 @@ envoy_benchmark_test(
     name = "load_balancer_benchmark_test",
     timeout = "long",
     benchmark_binary = "load_balancer_benchmark",
+    tags = ["fails_on_windows"],
 )
 
 envoy_cc_test(
diff --git a/test/extensions/common/aws/BUILD b/test/extensions/common/aws/BUILD
index 2a177200f6e7..eae532ee27f9 100644
--- a/test/extensions/common/aws/BUILD
+++ b/test/extensions/common/aws/BUILD
@@ -76,6 +76,7 @@ envoy_cc_test(
     srcs = [
         "aws_metadata_fetcher_integration_test.cc",
     ],
+    tags = ["fails_on_windows"],
     deps = [
         "//source/common/common:fmt_lib",
         "//source/extensions/common/aws:utility_lib",
diff --git a/test/extensions/filters/http/cors/BUILD b/test/extensions/filters/http/cors/BUILD
index 43a70cd13f01..a91934cb1249 100644
--- a/test/extensions/filters/http/cors/BUILD
+++ b/test/extensions/filters/http/cors/BUILD
@@ -30,6 +30,7 @@ envoy_extension_cc_test(
     name = "cors_filter_integration_test",
     srcs = ["cors_filter_integration_test.cc"],
     extension_name = "envoy.filters.http.cors",
+    tags = ["fails_on_windows"],
     deps = [
         "//source/common/buffer:buffer_lib",
         "//source/common/http:header_map_lib",
diff --git a/test/extensions/filters/http/router/BUILD b/test/extensions/filters/http/router/BUILD
index 5e0dca9e8224..46aaecbb7ae2 100644
--- a/test/extensions/filters/http/router/BUILD
+++ b/test/extensions/filters/http/router/BUILD
@@ -30,6 +30,7 @@ envoy_extension_cc_test(
         "//test/config/integration/certs",
     ],
     extension_name = "envoy.filters.http.router",
+    tags = ["fails_on_windows"],
     deps = [
         "//source/extensions/filters/http/router:config",
         "//test/integration:http_integration_lib",
diff --git a/test/extensions/filters/network/rbac/BUILD b/test/extensions/filters/network/rbac/BUILD
index 440b07896711..8d4d479cefb0 100644
--- a/test/extensions/filters/network/rbac/BUILD
+++ b/test/extensions/filters/network/rbac/BUILD
@@ -41,6 +41,7 @@ envoy_extension_cc_test(
     name = "integration_test",
     srcs = ["integration_test.cc"],
     extension_name = "envoy.filters.network.rbac",
+    tags = ["fails_on_windows"],
     deps = [
         "//source/extensions/filters/network/echo:config",
         "//source/extensions/filters/network/rbac:config",
diff --git a/test/extensions/transport_sockets/alts/BUILD b/test/extensions/transport_sockets/alts/BUILD
index d2e0f2998f07..386c25ace615 100644
--- a/test/extensions/transport_sockets/alts/BUILD
+++ b/test/extensions/transport_sockets/alts/BUILD
@@ -78,6 +78,7 @@ envoy_extension_cc_test(
         "grpc_alts_handshaker_proto",
         "grpc_alts_transport_security_common_proto",
     ],
+    tags = ["fails_on_windows"],
     deps = [
         "//source/common/common:utility_lib",
         "//source/common/event:dispatcher_includes",
diff --git a/test/integration/BUILD b/test/integration/BUILD
index 7e05463e2354..5fe7aa10a5f1 100644
--- a/test/integration/BUILD
+++ b/test/integration/BUILD
@@ -185,6 +185,7 @@ envoy_cc_test(
 envoy_cc_test(
     name = "cluster_filter_integration_test",
     srcs = ["cluster_filter_integration_test.cc"],
+    tags = ["fails_on_windows"],
     deps = [
         ":integration_lib",
         "//include/envoy/network:filter_interface",
@@ -198,6 +199,7 @@ envoy_cc_test(
 envoy_cc_test(
     name = "custom_cluster_integration_test",
     srcs = ["custom_cluster_integration_test.cc"],
+    tags = ["fails_on_windows"],
     deps = [
         ":http_integration_lib",
         "//source/common/upstream:load_balancer_lib",
@@ -373,6 +375,7 @@ envoy_cc_test(
     data = [
         "//test/config/integration/certs",
     ],
+    tags = ["fails_on_windows"],
     deps = [
         ":http_integration_lib",
         "//source/extensions/transport_sockets/tls:context_lib",
@@ -389,6 +392,7 @@ envoy_cc_test(
     srcs = [
         "header_casing_integration_test.cc",
     ],
+    tags = ["fails_on_windows"],
     deps = [
         ":http_integration_lib",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
@@ -743,6 +747,7 @@ envoy_cc_test(
     # The symbol table cluster memory tests take a while to run specially under tsan.
     # Shard it to avoid test timeout.
     shard_count = 2,
+    tags = ["fails_on_windows"],
     deps = [
         ":integration_lib",
         "//source/common/memory:stats_lib",
@@ -942,6 +947,7 @@ envoy_cc_test(
         "//test/config/integration/certs",
     ],
     shard_count = 2,
+    tags = ["fails_on_windows"],
     deps = [
         ":integration_lib",
         "//source/common/config:api_version_lib",
@@ -988,6 +994,7 @@ envoy_cc_test(
     srcs = [
         "tcp_conn_pool_integration_test.cc",
     ],
+    tags = ["fails_on_windows"],
     deps = [
         ":integration_lib",
         "//include/envoy/server:filter_config_interface",
@@ -1039,7 +1046,6 @@ envoy_cc_test(
     name = "dynamic_validation_integration_test",
     srcs = ["dynamic_validation_integration_test.cc"],
     data = ["//test/config/integration:server_xds_files"],
-    # Fails on windows with cr/lf yaml file checkouts
     tags = ["fails_on_windows"],
     deps = [
         ":http_integration_lib",
@@ -1082,6 +1088,7 @@ envoy_cc_test(
     data = [
         "//test/config/integration/certs",
     ],
+    tags = ["fails_on_windows"],
     deps = [
         ":http_integration_lib",
         "//source/common/http:header_map_lib",
diff --git a/test/server/BUILD b/test/server/BUILD
index ac23c10adf56..64b8c639188c 100644
--- a/test/server/BUILD
+++ b/test/server/BUILD
@@ -344,7 +344,6 @@ envoy_cc_test(
         ":server_test_data",
         ":static_validation_test_data",
     ],
-    # Fails on windows with cr/lf yaml file checkouts
     tags = ["fails_on_windows"],
     deps = [
         "//source/common/common:version_lib",