diff --git a/test/extensions/filters/listener/common/BUILD b/test/extensions/filters/listener/common/fuzz/BUILD
similarity index 100%
rename from test/extensions/filters/listener/common/BUILD
rename to test/extensions/filters/listener/common/fuzz/BUILD
diff --git a/test/extensions/filters/listener/common/listener_filter_fuzzer.cc b/test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.cc
similarity index 90%
rename from test/extensions/filters/listener/common/listener_filter_fuzzer.cc
rename to test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.cc
index 6ae3d9f689d87..f38aba8918f22 100644
--- a/test/extensions/filters/listener/common/listener_filter_fuzzer.cc
+++ b/test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.cc
@@ -1,4 +1,4 @@
-#include "test/extensions/filters/listener/common/listener_filter_fuzzer.h"
+#include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h"
 
 #include "common/network/utility.h"
 
diff --git a/test/extensions/filters/listener/common/listener_filter_fuzzer.h b/test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h
similarity index 90%
rename from test/extensions/filters/listener/common/listener_filter_fuzzer.h
rename to test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h
index d32eda68dbd7e..fe81a9e12cc46 100644
--- a/test/extensions/filters/listener/common/listener_filter_fuzzer.h
+++ b/test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h
@@ -1,6 +1,6 @@
 #include "envoy/network/filter.h"
 
-#include "test/extensions/filters/listener/common/listener_filter_fuzzer.pb.validate.h"
+#include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.pb.validate.h"
 #include "test/mocks/network/fakes.h"
 #include "test/mocks/network/mocks.h"
 
diff --git a/test/extensions/filters/listener/common/listener_filter_fuzzer.proto b/test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.proto
similarity index 100%
rename from test/extensions/filters/listener/common/listener_filter_fuzzer.proto
rename to test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.proto
diff --git a/test/extensions/filters/listener/original_dst/BUILD b/test/extensions/filters/listener/original_dst/BUILD
index 50c3b5931b3a1..ba71d8f6bbb9f 100644
--- a/test/extensions/filters/listener/original_dst/BUILD
+++ b/test/extensions/filters/listener/original_dst/BUILD
@@ -28,6 +28,6 @@ envoy_cc_fuzz_test(
     corpus = "original_dst_corpus",
     deps = [
         "//source/extensions/filters/listener/original_dst:original_dst_lib",
-        "//test/extensions/filters/listener/common:listener_filter_fuzzer_lib",
+        "//test/extensions/filters/listener/common/fuzz:listener_filter_fuzzer_lib",
     ],
 )
diff --git a/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc b/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc
index db982456e34f0..5476b6326e3a9 100644
--- a/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc
+++ b/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc
@@ -1,7 +1,7 @@
 #include "extensions/filters/listener/original_dst/original_dst.h"
 
-#include "test/extensions/filters/listener/common/listener_filter_fuzzer.h"
-#include "test/extensions/filters/listener/common/listener_filter_fuzzer.pb.validate.h"
+#include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h"
+#include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.pb.validate.h"
 #include "test/fuzz/fuzz_runner.h"
 
 namespace Envoy {
diff --git a/test/extensions/filters/listener/original_src/BUILD b/test/extensions/filters/listener/original_src/BUILD
index e4ab735046121..217e8b2586deb 100644
--- a/test/extensions/filters/listener/original_src/BUILD
+++ b/test/extensions/filters/listener/original_src/BUILD
@@ -56,7 +56,7 @@ envoy_proto_library(
     name = "original_src_fuzz_test_proto",
     srcs = ["original_src_fuzz_test.proto"],
     deps = [
-        "//test/extensions/filters/listener/common:listener_filter_fuzzer_proto",
+        "//test/extensions/filters/listener/common/fuzz:listener_filter_fuzzer_proto",
         "@envoy_api//envoy/extensions/filters/listener/original_src/v3:pkg",
     ],
 )
@@ -68,6 +68,6 @@ envoy_cc_fuzz_test(
     deps = [
         ":original_src_fuzz_test_proto_cc_proto",
         "//source/extensions/filters/listener/original_src:original_src_lib",
-        "//test/extensions/filters/listener/common:listener_filter_fuzzer_lib",
+        "//test/extensions/filters/listener/common/fuzz:listener_filter_fuzzer_lib",
     ],
 )
diff --git a/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc b/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc
index 3423b71560fca..c677a55b8d557 100644
--- a/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc
+++ b/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc
@@ -1,6 +1,6 @@
 #include "extensions/filters/listener/original_src/original_src.h"
 
-#include "test/extensions/filters/listener/common/listener_filter_fuzzer.h"
+#include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h"
 #include "test/extensions/filters/listener/original_src/original_src_fuzz_test.pb.validate.h"
 #include "test/fuzz/fuzz_runner.h"
 
diff --git a/test/extensions/filters/listener/original_src/original_src_fuzz_test.proto b/test/extensions/filters/listener/original_src/original_src_fuzz_test.proto
index 6934664f7fe0c..303b3c86daaa1 100644
--- a/test/extensions/filters/listener/original_src/original_src_fuzz_test.proto
+++ b/test/extensions/filters/listener/original_src/original_src_fuzz_test.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package envoy.extensions.filters.listener.original_src;
 
 import "envoy/extensions/filters/listener/original_src/v3/original_src.proto";
-import "test/extensions/filters/listener/common/listener_filter_fuzzer.proto";
+import "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.proto";
 import "validate/validate.proto";
 
 message OriginalSrcTestCase {