diff --git a/test/extensions/filters/network/kafka/BUILD b/test/extensions/filters/network/kafka/BUILD
index 19ac80b6947f1..d45e3702b0da2 100644
--- a/test/extensions/filters/network/kafka/BUILD
+++ b/test/extensions/filters/network/kafka/BUILD
@@ -100,7 +100,6 @@ envoy_extension_cc_test(
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
         "//source/extensions/filters/network/kafka:kafka_request_parser_lib",
-        "//test/mocks/server:server_mocks",
     ],
 )
 
@@ -111,7 +110,6 @@ envoy_extension_cc_test(
     deps = [
         ":buffer_based_test_lib",
         "//source/extensions/filters/network/kafka:kafka_request_codec_lib",
-        "//test/mocks/server:server_mocks",
     ],
 )
 
@@ -123,7 +121,6 @@ envoy_extension_cc_test(
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
         "//source/extensions/filters/network/kafka:kafka_request_codec_lib",
-        "//test/mocks/server:server_mocks",
     ],
 )
 
@@ -135,7 +132,6 @@ envoy_extension_cc_test(
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
         "//source/extensions/filters/network/kafka:kafka_request_codec_lib",
-        "//test/mocks/server:server_mocks",
     ],
 )
 
@@ -146,7 +142,6 @@ envoy_extension_cc_test(
     deps = [
         ":buffer_based_test_lib",
         "//source/extensions/filters/network/kafka:kafka_request_codec_lib",
-        "//test/mocks/server:server_mocks",
     ],
 )
 
@@ -180,7 +175,6 @@ envoy_extension_cc_test(
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
         "//source/extensions/filters/network/kafka:kafka_response_parser_lib",
-        "//test/mocks/server:server_mocks",
     ],
 )
 
@@ -191,7 +185,6 @@ envoy_extension_cc_test(
     deps = [
         ":buffer_based_test_lib",
         "//source/extensions/filters/network/kafka:kafka_response_codec_lib",
-        "//test/mocks/server:server_mocks",
     ],
 )
 
@@ -203,7 +196,6 @@ envoy_extension_cc_test(
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
         "//source/extensions/filters/network/kafka:kafka_response_codec_lib",
-        "//test/mocks/server:server_mocks",
     ],
 )
 
@@ -215,7 +207,6 @@ envoy_extension_cc_test(
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
         "//source/extensions/filters/network/kafka:kafka_response_codec_lib",
-        "//test/mocks/server:server_mocks",
     ],
 )
 
@@ -226,7 +217,6 @@ envoy_extension_cc_test(
     deps = [
         ":buffer_based_test_lib",
         "//source/extensions/filters/network/kafka:kafka_response_codec_lib",
-        "//test/mocks/server:server_mocks",
     ],
 )
 
diff --git a/test/extensions/filters/network/kafka/broker/BUILD b/test/extensions/filters/network/kafka/broker/BUILD
index 89664fb909b8d..158c8a7cb27b9 100644
--- a/test/extensions/filters/network/kafka/broker/BUILD
+++ b/test/extensions/filters/network/kafka/broker/BUILD
@@ -27,7 +27,8 @@ envoy_extension_cc_test(
     extension_name = "envoy.filters.network.kafka_broker",
     deps = [
         "//source/extensions/filters/network/kafka:kafka_broker_filter_lib",
-        "//test/mocks/server:server_mocks",
+        "//test/mocks/network:network_mocks",
+        "//test/mocks/stats:stats_mocks",
     ],
 )
 
diff --git a/test/extensions/filters/network/kafka/broker/filter_unit_test.cc b/test/extensions/filters/network/kafka/broker/filter_unit_test.cc
index 13f4c6cd271f8..51e251504ced6 100644
--- a/test/extensions/filters/network/kafka/broker/filter_unit_test.cc
+++ b/test/extensions/filters/network/kafka/broker/filter_unit_test.cc
@@ -1,7 +1,7 @@
 #include "extensions/filters/network/kafka/broker/filter.h"
 #include "extensions/filters/network/kafka/external/requests.h"
 
-#include "test/mocks/server/mocks.h"
+#include "test/mocks/network/mocks.h"
 #include "test/mocks/stats/mocks.h"
 
 #include "gmock/gmock.h"
diff --git a/test/extensions/filters/network/kafka/kafka_request_parser_test.cc b/test/extensions/filters/network/kafka/kafka_request_parser_test.cc
index 42bd15436ac31..cb20b878098f6 100644
--- a/test/extensions/filters/network/kafka/kafka_request_parser_test.cc
+++ b/test/extensions/filters/network/kafka/kafka_request_parser_test.cc
@@ -2,7 +2,6 @@
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
-#include "test/mocks/server/mocks.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/extensions/filters/network/kafka/kafka_response_parser_test.cc b/test/extensions/filters/network/kafka/kafka_response_parser_test.cc
index 4028423635c47..b905fc326f449 100644
--- a/test/extensions/filters/network/kafka/kafka_response_parser_test.cc
+++ b/test/extensions/filters/network/kafka/kafka_response_parser_test.cc
@@ -2,7 +2,6 @@
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
-#include "test/mocks/server/mocks.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2
index aa03d24ea8423..4c29ff3730766 100644
--- a/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2
+++ b/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2
@@ -14,7 +14,6 @@
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
-#include "test/mocks/server/mocks.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2
index b6af59d8962ce..ec96a4d90047c 100644
--- a/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2
+++ b/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2
@@ -7,7 +7,6 @@
 #include "extensions/filters/network/kafka/request_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
-#include "test/mocks/server/mocks.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2
index 060d1c64f3709..f366452cf19f6 100644
--- a/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2
+++ b/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2
@@ -14,7 +14,6 @@
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
-#include "test/mocks/server/mocks.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2
index f12a21f846c7f..84fff592eb344 100644
--- a/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2
+++ b/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2
@@ -7,7 +7,6 @@
 #include "extensions/filters/network/kafka/response_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
-#include "test/mocks/server/mocks.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/extensions/filters/network/kafka/request_codec_integration_test.cc b/test/extensions/filters/network/kafka/request_codec_integration_test.cc
index 69e77a7f8d2b9..8a7ae9b7a7a36 100644
--- a/test/extensions/filters/network/kafka/request_codec_integration_test.cc
+++ b/test/extensions/filters/network/kafka/request_codec_integration_test.cc
@@ -2,7 +2,6 @@
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
-#include "test/mocks/server/mocks.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/request_codec_unit_test.cc b/test/extensions/filters/network/kafka/request_codec_unit_test.cc
index eec27d7152150..9d9c0734262f5 100644
--- a/test/extensions/filters/network/kafka/request_codec_unit_test.cc
+++ b/test/extensions/filters/network/kafka/request_codec_unit_test.cc
@@ -1,7 +1,6 @@
 #include "extensions/filters/network/kafka/request_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
-#include "test/mocks/server/mocks.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/extensions/filters/network/kafka/response_codec_integration_test.cc b/test/extensions/filters/network/kafka/response_codec_integration_test.cc
index 08be46a156454..287ba9f1855a7 100644
--- a/test/extensions/filters/network/kafka/response_codec_integration_test.cc
+++ b/test/extensions/filters/network/kafka/response_codec_integration_test.cc
@@ -2,7 +2,6 @@
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
-#include "test/mocks/server/mocks.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/response_codec_unit_test.cc b/test/extensions/filters/network/kafka/response_codec_unit_test.cc
index 0327b1ef738ca..07dc116aab068 100644
--- a/test/extensions/filters/network/kafka/response_codec_unit_test.cc
+++ b/test/extensions/filters/network/kafka/response_codec_unit_test.cc
@@ -1,7 +1,6 @@
 #include "extensions/filters/network/kafka/response_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
-#include "test/mocks/server/mocks.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"