diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD
index 0d24bc7e22c6..f14425ee49dd 100644
--- a/bazel/external/quiche.BUILD
+++ b/bazel/external/quiche.BUILD
@@ -155,15 +155,9 @@ cc_library(
 cc_library(
     name = "quic_platform_port_utils",
     testonly = 1,
-    hdrs = envoy_select_quiche(
-        ["quiche/quic/platform/api/quic_port_utils.h"],
-        "@envoy",
-    ),
+    hdrs = ["quiche/quic/platform/api/quic_port_utils.h"],
     visibility = ["//visibility:public"],
-    deps = envoy_select_quiche(
-        ["@envoy//source/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_impl_lib"],
-        "@envoy",
-    ),
+    deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_impl_lib"],
 )
 
 cc_library(
diff --git a/bazel/external/quiche.genrule_cmd b/bazel/external/quiche.genrule_cmd
index 3993d532a29b..201c7db59f19 100644
--- a/bazel/external/quiche.genrule_cmd
+++ b/bazel/external/quiche.genrule_cmd
@@ -18,6 +18,9 @@ src_base_dir=$$(dirname $$(dirname $$(dirname $(rootpath quic/core/quic_constant
 
 # sed commands to apply to each source file.
 cat <<EOF >sed_commands
+# Rewrite include directives for testonly platform impl files.
+/^#include/ s!net/quic/platform/impl/quic_port_utils_impl.h!test/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.h!
+
 # Rewrite include directives for platform impl files.
 /^#include/ s!net/(http2|spdy|quic)/platform/impl/!extensions/quic_listeners/quiche/platform/!
 
diff --git a/source/extensions/quic_listeners/quiche/platform/BUILD b/source/extensions/quic_listeners/quiche/platform/BUILD
index f011cd34b33d..f4de4ab3cbd7 100644
--- a/source/extensions/quic_listeners/quiche/platform/BUILD
+++ b/source/extensions/quic_listeners/quiche/platform/BUILD
@@ -66,13 +66,6 @@ envoy_cc_library(
     visibility = ["//visibility:public"],
 )
 
-envoy_cc_test_library(
-    name = "quic_platform_port_utils_impl_lib",
-    hdrs = ["quic_port_utils_impl.h"],
-    include_prefix = "extensions/quic_listeners/quiche/platform",
-    deps = ["//test/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_test_impl_lib"],
-)
-
 envoy_cc_library(
     name = "quic_platform_logging_impl_lib",
     srcs = ["quic_logging_impl.cc"],
diff --git a/source/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.h
deleted file mode 100644
index 449f0cb7524c..000000000000
--- a/source/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-// NOLINT(namespace-envoy)
-
-// This file is part of the QUICHE platform implementation, and is not to be
-// consumed or referenced directly by other Envoy code. It serves purely as a
-// porting layer for QUICHE.
-
-// Link in actually implementation under //test. This is necessary because test
-// only feature should stay under //test to for maintenance purpose.
-#include "test/extensions/quic_listeners/quiche/platform/quic_port_utils_test_impl.h"
diff --git a/test/extensions/quic_listeners/quiche/platform/BUILD b/test/extensions/quic_listeners/quiche/platform/BUILD
index 0f7a8b80c6a7..91fa162c97e5 100644
--- a/test/extensions/quic_listeners/quiche/platform/BUILD
+++ b/test/extensions/quic_listeners/quiche/platform/BUILD
@@ -55,9 +55,9 @@ envoy_cc_test(
 )
 
 envoy_cc_test_library(
-    name = "quic_platform_port_utils_test_impl_lib",
-    srcs = ["quic_port_utils_test_impl.cc"],
-    hdrs = ["quic_port_utils_test_impl.h"],
+    name = "quic_platform_port_utils_impl_lib",
+    srcs = ["quic_port_utils_impl.cc"],
+    hdrs = ["quic_port_utils_impl.h"],
     deps = [
         "//source/common/network:utility_lib",
         "//test/test_common:environment_lib",
diff --git a/test/extensions/quic_listeners/quiche/platform/quic_port_utils_test_impl.cc b/test/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.cc
similarity index 98%
rename from test/extensions/quic_listeners/quiche/platform/quic_port_utils_test_impl.cc
rename to test/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.cc
index e8ae583bc494..5dee83fb0420 100644
--- a/test/extensions/quic_listeners/quiche/platform/quic_port_utils_test_impl.cc
+++ b/test/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.cc
@@ -4,7 +4,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "test/extensions/quic_listeners/quiche/platform/quic_port_utils_test_impl.h"
+#include "test/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.h"
 
 #include "envoy/network/address.h"
 
diff --git a/test/extensions/quic_listeners/quiche/platform/quic_port_utils_test_impl.h b/test/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.h
similarity index 100%
rename from test/extensions/quic_listeners/quiche/platform/quic_port_utils_test_impl.h
rename to test/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.h