diff --git a/build/source_list.bzl b/build/source_list.bzl
index 35ae6e0..d61599a 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -1363,6 +1363,7 @@
 ]
 fuzzers_srcs = [
     "common/structured_headers_fuzzer.cc",
+    "http2/core/http2_frame_decoder_adapter_fuzzer.cc",
     "http2/decoder/http2_frame_decoder_fuzzer.cc",
     "quic/core/crypto/certificate_view_der_fuzzer.cc",
     "quic/core/crypto/certificate_view_pem_fuzzer.cc",
@@ -1374,7 +1375,6 @@
     "quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc",
     "quic/test_tools/fuzzing/quic_framer_fuzzer.cc",
     "quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc",
-    "spdy/core/http2_frame_decoder_adapter_fuzzer.cc",
 ]
 cli_tools_hdrs = [
     "quic/tools/quic_server_factory.h",
diff --git a/build/source_list.gni b/build/source_list.gni
index 32e618b..b7b50aa 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -1366,6 +1366,7 @@
 ]
 fuzzers_srcs = [
     "src/quiche/common/structured_headers_fuzzer.cc",
+    "src/quiche/http2/core/http2_frame_decoder_adapter_fuzzer.cc",
     "src/quiche/http2/decoder/http2_frame_decoder_fuzzer.cc",
     "src/quiche/quic/core/crypto/certificate_view_der_fuzzer.cc",
     "src/quiche/quic/core/crypto/certificate_view_pem_fuzzer.cc",
@@ -1377,7 +1378,6 @@
     "src/quiche/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc",
     "src/quiche/quic/test_tools/fuzzing/quic_framer_fuzzer.cc",
     "src/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc",
-    "src/quiche/spdy/core/http2_frame_decoder_adapter_fuzzer.cc",
 ]
 cli_tools_hdrs = [
     "src/quiche/quic/tools/quic_server_factory.h",
diff --git a/build/source_list.json b/build/source_list.json
index 05c51a5..f8f2861 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -1365,6 +1365,7 @@
   ],
   "fuzzers_srcs": [
     "quiche/common/structured_headers_fuzzer.cc",
+    "quiche/http2/core/http2_frame_decoder_adapter_fuzzer.cc",
     "quiche/http2/decoder/http2_frame_decoder_fuzzer.cc",
     "quiche/quic/core/crypto/certificate_view_der_fuzzer.cc",
     "quiche/quic/core/crypto/certificate_view_pem_fuzzer.cc",
@@ -1375,8 +1376,7 @@
     "quiche/quic/core/qpack/fuzzer/qpack_encoder_stream_sender_fuzzer.cc",
     "quiche/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc",
     "quiche/quic/test_tools/fuzzing/quic_framer_fuzzer.cc",
-    "quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc",
-    "quiche/spdy/core/http2_frame_decoder_adapter_fuzzer.cc"
+    "quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc"
   ],
   "cli_tools_hdrs": [
     "quiche/quic/tools/quic_server_factory.h",
diff --git a/quiche/spdy/core/http2_frame_decoder_adapter_fuzzer.cc b/quiche/http2/core/http2_frame_decoder_adapter_fuzzer.cc
similarity index 100%
rename from quiche/spdy/core/http2_frame_decoder_adapter_fuzzer.cc
rename to quiche/http2/core/http2_frame_decoder_adapter_fuzzer.cc