diff --git a/quiche/http2/decoder/decode_http2_structures_test.cc b/quiche/http2/decoder/decode_http2_structures_test.cc
index c94440b..6ace3a6 100644
--- a/quiche/http2/decoder/decode_http2_structures_test.cc
+++ b/quiche/http2/decoder/decode_http2_structures_test.cc
@@ -15,9 +15,9 @@
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
 
diff --git a/quiche/http2/decoder/http2_structure_decoder_test.cc b/quiche/http2/decoder/http2_structure_decoder_test.cc
index a550e9c..8e4f85b 100644
--- a/quiche/http2/decoder/http2_structure_decoder_test.cc
+++ b/quiche/http2/decoder/http2_structure_decoder_test.cc
@@ -27,8 +27,8 @@
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test_helpers.h"
diff --git a/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder_test.cc
index ad60b5e..f71d391 100644
--- a/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder_test.cc
@@ -10,13 +10,13 @@
 #include <tuple>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc
index b0eec6b..17c3391 100644
--- a/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc
@@ -10,11 +10,11 @@
 #include <type_traits>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
 #include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc
index 46542c7..0110a48 100644
--- a/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc
@@ -9,14 +9,14 @@
 #include <string>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
 #include "quiche/http2/http2_structures.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/goaway_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/goaway_payload_decoder_test.cc
index 576c6e7..d0b269f 100644
--- a/quiche/http2/decoder/payload_decoders/goaway_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/goaway_payload_decoder_test.cc
@@ -9,13 +9,13 @@
 #include <string>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/headers_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/headers_payload_decoder_test.cc
index c51219b..a839e3b 100644
--- a/quiche/http2/decoder/payload_decoders/headers_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/headers_payload_decoder_test.cc
@@ -9,13 +9,13 @@
 #include <string>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/ping_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/ping_payload_decoder_test.cc
index bac4555..ffdbf6a 100644
--- a/quiche/http2/decoder/payload_decoders/ping_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/ping_payload_decoder_test.cc
@@ -7,13 +7,13 @@
 #include <stddef.h>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/priority_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/priority_payload_decoder_test.cc
index fe4657c..3b2dca4 100644
--- a/quiche/http2/decoder/payload_decoders/priority_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/priority_payload_decoder_test.cc
@@ -7,13 +7,13 @@
 #include <stddef.h>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder_test.cc
index 94a1fa7..960bdbd 100644
--- a/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder_test.cc
@@ -9,13 +9,13 @@
 #include <string>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder_test.cc
index 2b15341..e110977 100644
--- a/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder_test.cc
@@ -9,13 +9,13 @@
 #include <string>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder_test.cc
index 40c613e..9cb0326 100644
--- a/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder_test.cc
@@ -7,14 +7,14 @@
 #include <stddef.h>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_constants_test_util.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
+#include "quiche/http2/test_tools/http2_constants_test_util.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/settings_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/settings_payload_decoder_test.cc
index 8173c72..ec94419 100644
--- a/quiche/http2/decoder/payload_decoders/settings_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/settings_payload_decoder_test.cc
@@ -9,14 +9,14 @@
 #include <vector>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_constants_test_util.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
+#include "quiche/http2/test_tools/http2_constants_test_util.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc
index 182816a..fb92e8a 100644
--- a/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc
@@ -10,12 +10,12 @@
 #include <type_traits>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
 #include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/payload_decoders/window_update_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/window_update_payload_decoder_test.cc
index dad599e..b2cd763 100644
--- a/quiche/http2/decoder/payload_decoders/window_update_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/window_update_payload_decoder_test.cc
@@ -7,13 +7,13 @@
 #include <stddef.h>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/hpack/decoder/hpack_block_collector_test.cc b/quiche/http2/hpack/decoder/hpack_block_collector_test.cc
index bfbcc68..5edfe1c 100644
--- a/quiche/http2/hpack/decoder/hpack_block_collector_test.cc
+++ b/quiche/http2/hpack/decoder/hpack_block_collector_test.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/hpack/decoder/hpack_block_collector.h"
+#include "quiche/http2/test_tools/hpack_block_collector.h"
 
 // Tests of HpackBlockCollector. Not intended to be comprehensive, as
 // HpackBlockCollector is itself support for testing HpackBlockDecoder, and
 // should be pretty thoroughly exercised via the tests of HpackBlockDecoder.
 
-#include "quiche/http2/hpack/tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_block_builder.h"
 #include "quiche/common/platform/api/quiche_test.h"
 
 namespace http2 {
diff --git a/quiche/http2/hpack/decoder/hpack_block_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_block_decoder_test.cc
index 88fa658..959f095 100644
--- a/quiche/http2/hpack/decoder/hpack_block_decoder_test.cc
+++ b/quiche/http2/hpack/decoder/hpack_block_decoder_test.cc
@@ -11,10 +11,10 @@
 
 #include "absl/strings/string_view.h"
 #include "quiche/http2/decoder/decode_buffer.h"
-#include "quiche/http2/hpack/decoder/hpack_block_collector.h"
 #include "quiche/http2/hpack/http2_hpack_constants.h"
-#include "quiche/http2/hpack/tools/hpack_block_builder.h"
-#include "quiche/http2/hpack/tools/hpack_example.h"
+#include "quiche/http2/test_tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_block_collector.h"
+#include "quiche/http2/test_tools/hpack_example.h"
 #include "quiche/http2/test_tools/http2_random.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_decoder_test.cc
index 82a86a5..0a9f21b 100644
--- a/quiche/http2/hpack/decoder/hpack_decoder_test.cc
+++ b/quiche/http2/hpack/decoder/hpack_decoder_test.cc
@@ -16,9 +16,9 @@
 #include "quiche/http2/hpack/decoder/hpack_decoder_state.h"
 #include "quiche/http2/hpack/decoder/hpack_decoder_tables.h"
 #include "quiche/http2/hpack/http2_hpack_constants.h"
-#include "quiche/http2/hpack/tools/hpack_block_builder.h"
-#include "quiche/http2/hpack/tools/hpack_example.h"
 #include "quiche/http2/http2_constants.h"
+#include "quiche/http2/test_tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_example.h"
 #include "quiche/http2/test_tools/http2_random.h"
 #include "quiche/http2/test_tools/random_util.h"
 #include "quiche/common/platform/api/quiche_logging.h"
diff --git a/quiche/http2/hpack/decoder/hpack_entry_collector_test.cc b/quiche/http2/hpack/decoder/hpack_entry_collector_test.cc
index 3fca697..8512ce0 100644
--- a/quiche/http2/hpack/decoder/hpack_entry_collector_test.cc
+++ b/quiche/http2/hpack/decoder/hpack_entry_collector_test.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/hpack/decoder/hpack_entry_collector.h"
+#include "quiche/http2/test_tools/hpack_entry_collector.h"
 
 // Tests of HpackEntryCollector.
 
diff --git a/quiche/http2/hpack/decoder/hpack_entry_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_entry_decoder_test.cc
index a84e3a6..ce4fb89 100644
--- a/quiche/http2/hpack/decoder/hpack_entry_decoder_test.cc
+++ b/quiche/http2/hpack/decoder/hpack_entry_decoder_test.cc
@@ -8,8 +8,8 @@
 
 #include <cstdint>
 
-#include "quiche/http2/hpack/decoder/hpack_entry_collector.h"
-#include "quiche/http2/hpack/tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_entry_collector.h"
 #include "quiche/http2/test_tools/http2_random.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc
index f90622e..c01f9c8 100644
--- a/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc
+++ b/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc
@@ -6,7 +6,7 @@
 
 #include <vector>
 
-#include "quiche/http2/hpack/tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_block_builder.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc
index e27e9db..800e5be 100644
--- a/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc
+++ b/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc
@@ -7,9 +7,9 @@
 // Tests of HpackStringDecoder.
 
 #include "absl/strings/string_view.h"
-#include "quiche/http2/hpack/decoder/hpack_string_collector.h"
 #include "quiche/http2/hpack/decoder/hpack_string_decoder_listener.h"
-#include "quiche/http2/hpack/tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_string_collector.h"
 #include "quiche/http2/test_tools/http2_random.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc b/quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc
index bf890ba..18ef001 100644
--- a/quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc
+++ b/quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc
@@ -16,7 +16,7 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-#include "quiche/http2/hpack/tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_block_builder.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/http2_structures_test.cc b/quiche/http2/http2_structures_test.cc
index c939f81..dd286f7 100644
--- a/quiche/http2/http2_structures_test.cc
+++ b/quiche/http2/http2_structures_test.cc
@@ -20,8 +20,8 @@
 #include <vector>
 
 #include "absl/strings/str_cat.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
 #include "quiche/common/platform/api/quiche_test.h"
 #include "quiche/common/platform/api/quiche_test_helpers.h"
 
diff --git a/quiche/http2/decoder/frame_decoder_state_test_util.cc b/quiche/http2/test_tools/frame_decoder_state_test_util.cc
similarity index 83%
rename from quiche/http2/decoder/frame_decoder_state_test_util.cc
rename to quiche/http2/test_tools/frame_decoder_state_test_util.cc
index 3781561..e3eab59 100644
--- a/quiche/http2/decoder/frame_decoder_state_test_util.cc
+++ b/quiche/http2/test_tools/frame_decoder_state_test_util.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/decoder/frame_decoder_state_test_util.h"
+#include "quiche/http2/test_tools/frame_decoder_state_test_util.h"
 
-#include "quiche/http2/decoder/http2_structure_decoder_test_util.h"
 #include "quiche/http2/http2_structures.h"
-#include "quiche/http2/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/http2_random.h"
+#include "quiche/http2/test_tools/http2_structure_decoder_test_util.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
diff --git a/quiche/http2/decoder/frame_decoder_state_test_util.h b/quiche/http2/test_tools/frame_decoder_state_test_util.h
similarity index 87%
rename from quiche/http2/decoder/frame_decoder_state_test_util.h
rename to quiche/http2/test_tools/frame_decoder_state_test_util.h
index d940d8f..6047923 100644
--- a/quiche/http2/decoder/frame_decoder_state_test_util.h
+++ b/quiche/http2/test_tools/frame_decoder_state_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_DECODER_FRAME_DECODER_STATE_TEST_UTIL_H_
-#define QUICHE_HTTP2_DECODER_FRAME_DECODER_STATE_TEST_UTIL_H_
+#ifndef QUICHE_HTTP2_TEST_TOOLS_FRAME_DECODER_STATE_TEST_UTIL_H_
+#define QUICHE_HTTP2_TEST_TOOLS_FRAME_DECODER_STATE_TEST_UTIL_H_
 
 #include "quiche/http2/decoder/frame_decoder_state.h"
 #include "quiche/http2/http2_structures.h"
@@ -34,4 +34,4 @@
 }  // namespace test
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_DECODER_FRAME_DECODER_STATE_TEST_UTIL_H_
+#endif  // QUICHE_HTTP2_TEST_TOOLS_FRAME_DECODER_STATE_TEST_UTIL_H_
diff --git a/quiche/http2/test_tools/frame_parts.cc b/quiche/http2/test_tools/frame_parts.cc
index ba0396a..3897238 100644
--- a/quiche/http2/test_tools/frame_parts.cc
+++ b/quiche/http2/test_tools/frame_parts.cc
@@ -7,7 +7,7 @@
 #include <type_traits>
 
 #include "absl/strings/escaping.h"
-#include "quiche/http2/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
 #include "quiche/common/platform/api/quiche_test_helpers.h"
diff --git a/quiche/http2/test_tools/frame_parts_collector.cc b/quiche/http2/test_tools/frame_parts_collector.cc
index f9de389..2b8f616 100644
--- a/quiche/http2/test_tools/frame_parts_collector.cc
+++ b/quiche/http2/test_tools/frame_parts_collector.cc
@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "quiche/http2/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
 
diff --git a/quiche/http2/test_tools/frame_parts_collector.h b/quiche/http2/test_tools/frame_parts_collector.h
index ccb6142..58adcdb 100644
--- a/quiche/http2/test_tools/frame_parts_collector.h
+++ b/quiche/http2/test_tools/frame_parts_collector.h
@@ -14,9 +14,9 @@
 #include <vector>
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/decoder/http2_frame_decoder_listener_test_util.h"
 #include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts.h"
+#include "quiche/http2/test_tools/http2_frame_decoder_listener_test_util.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/hpack/tools/hpack_block_builder.cc b/quiche/http2/test_tools/hpack_block_builder.cc
similarity index 97%
rename from quiche/http2/hpack/tools/hpack_block_builder.cc
rename to quiche/http2/test_tools/hpack_block_builder.cc
index b4eddb7..bd9119a 100644
--- a/quiche/http2/hpack/tools/hpack_block_builder.cc
+++ b/quiche/http2/test_tools/hpack_block_builder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/hpack/tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_block_builder.h"
 
 #include "quiche/http2/hpack/varint/hpack_varint_encoder.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
diff --git a/quiche/http2/hpack/tools/hpack_block_builder.h b/quiche/http2/test_tools/hpack_block_builder.h
similarity index 95%
rename from quiche/http2/hpack/tools/hpack_block_builder.h
rename to quiche/http2/test_tools/hpack_block_builder.h
index e1000d7..5aec637 100644
--- a/quiche/http2/hpack/tools/hpack_block_builder.h
+++ b/quiche/http2/test_tools/hpack_block_builder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_HPACK_TOOLS_HPACK_BLOCK_BUILDER_H_
-#define QUICHE_HTTP2_HPACK_TOOLS_HPACK_BLOCK_BUILDER_H_
+#ifndef QUICHE_HTTP2_TEST_TOOLS_HPACK_BLOCK_BUILDER_H_
+#define QUICHE_HTTP2_TEST_TOOLS_HPACK_BLOCK_BUILDER_H_
 
 // HpackBlockBuilder builds wire-format HPACK blocks (or fragments thereof)
 // from components.
@@ -94,4 +94,4 @@
 }  // namespace test
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_HPACK_TOOLS_HPACK_BLOCK_BUILDER_H_
+#endif  // QUICHE_HTTP2_TEST_TOOLS_HPACK_BLOCK_BUILDER_H_
diff --git a/quiche/http2/hpack/tools/hpack_block_builder_test.cc b/quiche/http2/test_tools/hpack_block_builder_test.cc
similarity index 98%
rename from quiche/http2/hpack/tools/hpack_block_builder_test.cc
rename to quiche/http2/test_tools/hpack_block_builder_test.cc
index 26e42ff..7642049 100644
--- a/quiche/http2/hpack/tools/hpack_block_builder_test.cc
+++ b/quiche/http2/test_tools/hpack_block_builder_test.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/hpack/tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_block_builder.h"
 
 #include "absl/strings/escaping.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/hpack/decoder/hpack_block_collector.cc b/quiche/http2/test_tools/hpack_block_collector.cc
similarity index 98%
rename from quiche/http2/hpack/decoder/hpack_block_collector.cc
rename to quiche/http2/test_tools/hpack_block_collector.cc
index 08e46ff..7cd01ac 100644
--- a/quiche/http2/hpack/decoder/hpack_block_collector.cc
+++ b/quiche/http2/test_tools/hpack_block_collector.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/hpack/decoder/hpack_block_collector.h"
+#include "quiche/http2/test_tools/hpack_block_collector.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/quiche/http2/hpack/decoder/hpack_block_collector.h b/quiche/http2/test_tools/hpack_block_collector.h
similarity index 93%
rename from quiche/http2/hpack/decoder/hpack_block_collector.h
rename to quiche/http2/test_tools/hpack_block_collector.h
index d59b912..fe49d09 100644
--- a/quiche/http2/hpack/decoder/hpack_block_collector.h
+++ b/quiche/http2/test_tools/hpack_block_collector.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_HPACK_DECODER_HPACK_BLOCK_COLLECTOR_H_
-#define QUICHE_HTTP2_HPACK_DECODER_HPACK_BLOCK_COLLECTOR_H_
+#ifndef QUICHE_HTTP2_TEST_TOOLS_HPACK_BLOCK_COLLECTOR_H_
+#define QUICHE_HTTP2_TEST_TOOLS_HPACK_BLOCK_COLLECTOR_H_
 
 // HpackBlockCollector implements HpackEntryDecoderListener in order to record
 // the calls using HpackEntryCollector instances (one per HPACK entry). This
@@ -19,10 +19,10 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-#include "quiche/http2/hpack/decoder/hpack_entry_collector.h"
 #include "quiche/http2/hpack/decoder/hpack_entry_decoder_listener.h"
 #include "quiche/http2/hpack/http2_hpack_constants.h"
-#include "quiche/http2/hpack/tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_entry_collector.h"
 #include "quiche/http2/test_tools/http2_random.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
@@ -119,4 +119,4 @@
 }  // namespace test
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_HPACK_DECODER_HPACK_BLOCK_COLLECTOR_H_
+#endif  // QUICHE_HTTP2_TEST_TOOLS_HPACK_BLOCK_COLLECTOR_H_
diff --git a/quiche/http2/hpack/decoder/hpack_entry_collector.cc b/quiche/http2/test_tools/hpack_entry_collector.cc
similarity index 98%
rename from quiche/http2/hpack/decoder/hpack_entry_collector.cc
rename to quiche/http2/test_tools/hpack_entry_collector.cc
index d7f89e8..b99e35c 100644
--- a/quiche/http2/hpack/decoder/hpack_entry_collector.cc
+++ b/quiche/http2/test_tools/hpack_entry_collector.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/hpack/decoder/hpack_entry_collector.h"
+#include "quiche/http2/test_tools/hpack_entry_collector.h"
 
 #include "absl/strings/str_cat.h"
-#include "quiche/http2/hpack/decoder/hpack_string_collector.h"
 #include "quiche/http2/hpack/http2_hpack_constants.h"
+#include "quiche/http2/test_tools/hpack_string_collector.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
 #include "quiche/common/platform/api/quiche_test_helpers.h"
diff --git a/quiche/http2/hpack/decoder/hpack_entry_collector.h b/quiche/http2/test_tools/hpack_entry_collector.h
similarity index 94%
rename from quiche/http2/hpack/decoder/hpack_entry_collector.h
rename to quiche/http2/test_tools/hpack_entry_collector.h
index 24e70b2..93ad860 100644
--- a/quiche/http2/hpack/decoder/hpack_entry_collector.h
+++ b/quiche/http2/test_tools/hpack_entry_collector.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_HPACK_DECODER_HPACK_ENTRY_COLLECTOR_H_
-#define QUICHE_HTTP2_HPACK_DECODER_HPACK_ENTRY_COLLECTOR_H_
+#ifndef QUICHE_HTTP2_TEST_TOOLS_HPACK_ENTRY_COLLECTOR_H_
+#define QUICHE_HTTP2_TEST_TOOLS_HPACK_ENTRY_COLLECTOR_H_
 
 // HpackEntryCollector records calls to HpackEntryDecoderListener in support
 // of tests of HpackEntryDecoder, or which use it. Can only record the callbacks
@@ -17,9 +17,9 @@
 
 #include "absl/strings/string_view.h"
 #include "quiche/http2/hpack/decoder/hpack_entry_decoder_listener.h"
-#include "quiche/http2/hpack/decoder/hpack_string_collector.h"
 #include "quiche/http2/hpack/http2_hpack_constants.h"
-#include "quiche/http2/hpack/tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_block_builder.h"
+#include "quiche/http2/test_tools/hpack_string_collector.h"
 #include "quiche/common/platform/api/quiche_export.h"
 #include "quiche/common/platform/api/quiche_test.h"
 
@@ -148,4 +148,4 @@
 }  // namespace test
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_HPACK_DECODER_HPACK_ENTRY_COLLECTOR_H_
+#endif  // QUICHE_HTTP2_TEST_TOOLS_HPACK_ENTRY_COLLECTOR_H_
diff --git a/quiche/http2/hpack/tools/hpack_example.cc b/quiche/http2/test_tools/hpack_example.cc
similarity index 96%
rename from quiche/http2/hpack/tools/hpack_example.cc
rename to quiche/http2/test_tools/hpack_example.cc
index 15ac3b3..42d9261 100644
--- a/quiche/http2/hpack/tools/hpack_example.cc
+++ b/quiche/http2/test_tools/hpack_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/hpack/tools/hpack_example.h"
+#include "quiche/http2/test_tools/hpack_example.h"
 
 #include <ctype.h>
 
diff --git a/quiche/http2/hpack/tools/hpack_example.h b/quiche/http2/test_tools/hpack_example.h
similarity index 85%
rename from quiche/http2/hpack/tools/hpack_example.h
rename to quiche/http2/test_tools/hpack_example.h
index de203cc..007b969 100644
--- a/quiche/http2/hpack/tools/hpack_example.h
+++ b/quiche/http2/test_tools/hpack_example.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_HPACK_TOOLS_HPACK_EXAMPLE_H_
-#define QUICHE_HTTP2_HPACK_TOOLS_HPACK_EXAMPLE_H_
+#ifndef QUICHE_HTTP2_TEST_TOOLS_HPACK_EXAMPLE_H_
+#define QUICHE_HTTP2_TEST_TOOLS_HPACK_EXAMPLE_H_
 
 #include <string>
 
@@ -29,4 +29,4 @@
 }  // namespace test
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_HPACK_TOOLS_HPACK_EXAMPLE_H_
+#endif  // QUICHE_HTTP2_TEST_TOOLS_HPACK_EXAMPLE_H_
diff --git a/quiche/http2/hpack/tools/hpack_example_test.cc b/quiche/http2/test_tools/hpack_example_test.cc
similarity index 96%
rename from quiche/http2/hpack/tools/hpack_example_test.cc
rename to quiche/http2/test_tools/hpack_example_test.cc
index ddbea80..4dd24bd 100644
--- a/quiche/http2/hpack/tools/hpack_example_test.cc
+++ b/quiche/http2/test_tools/hpack_example_test.cc
@@ -1,4 +1,4 @@
-#include "quiche/http2/hpack/tools/hpack_example.h"
+#include "quiche/http2/test_tools/hpack_example.h"
 
 // Tests of HpackExampleToStringOrDie.
 
diff --git a/quiche/http2/hpack/decoder/hpack_string_collector.cc b/quiche/http2/test_tools/hpack_string_collector.cc
similarity index 97%
rename from quiche/http2/hpack/decoder/hpack_string_collector.cc
rename to quiche/http2/test_tools/hpack_string_collector.cc
index 1966b7f..63a78b2 100644
--- a/quiche/http2/hpack/decoder/hpack_string_collector.cc
+++ b/quiche/http2/test_tools/hpack_string_collector.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/hpack/decoder/hpack_string_collector.h"
+#include "quiche/http2/test_tools/hpack_string_collector.h"
 
 #include <stddef.h>
 
diff --git a/quiche/http2/hpack/decoder/hpack_string_collector.h b/quiche/http2/test_tools/hpack_string_collector.h
similarity index 89%
rename from quiche/http2/hpack/decoder/hpack_string_collector.h
rename to quiche/http2/test_tools/hpack_string_collector.h
index 8134b81..15dab67 100644
--- a/quiche/http2/hpack/decoder/hpack_string_collector.h
+++ b/quiche/http2/test_tools/hpack_string_collector.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_HPACK_DECODER_HPACK_STRING_COLLECTOR_H_
-#define QUICHE_HTTP2_HPACK_DECODER_HPACK_STRING_COLLECTOR_H_
+#ifndef QUICHE_HTTP2_TEST_TOOLS_HPACK_STRING_COLLECTOR_H_
+#define QUICHE_HTTP2_TEST_TOOLS_HPACK_STRING_COLLECTOR_H_
 
 // Supports tests of decoding HPACK strings.
 
@@ -63,4 +63,4 @@
 }  // namespace test
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_HPACK_DECODER_HPACK_STRING_COLLECTOR_H_
+#endif  // QUICHE_HTTP2_TEST_TOOLS_HPACK_STRING_COLLECTOR_H_
diff --git a/quiche/http2/http2_constants_test_util.cc b/quiche/http2/test_tools/http2_constants_test_util.cc
similarity index 97%
rename from quiche/http2/http2_constants_test_util.cc
rename to quiche/http2/test_tools/http2_constants_test_util.cc
index 7532595..ddb5cbd 100644
--- a/quiche/http2/http2_constants_test_util.cc
+++ b/quiche/http2/test_tools/http2_constants_test_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/http2_constants_test_util.h"
+#include "quiche/http2/test_tools/http2_constants_test_util.h"
 
 namespace http2 {
 namespace test {
diff --git a/quiche/http2/http2_constants_test_util.h b/quiche/http2/test_tools/http2_constants_test_util.h
similarity index 83%
rename from quiche/http2/http2_constants_test_util.h
rename to quiche/http2/test_tools/http2_constants_test_util.h
index ab5b2d0..20edc8d 100644
--- a/quiche/http2/http2_constants_test_util.h
+++ b/quiche/http2/test_tools/http2_constants_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_HTTP2_CONSTANTS_TEST_UTIL_H_
-#define QUICHE_HTTP2_HTTP2_CONSTANTS_TEST_UTIL_H_
+#ifndef QUICHE_HTTP2_TEST_TOOLS_HTTP2_CONSTANTS_TEST_UTIL_H_
+#define QUICHE_HTTP2_TEST_TOOLS_HTTP2_CONSTANTS_TEST_UTIL_H_
 
 #include <cstdint>
 #include <vector>
@@ -31,4 +31,4 @@
 }  // namespace test
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_HTTP2_CONSTANTS_TEST_UTIL_H_
+#endif  // QUICHE_HTTP2_TEST_TOOLS_HTTP2_CONSTANTS_TEST_UTIL_H_
diff --git a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.cc b/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.cc
similarity index 99%
rename from quiche/http2/decoder/http2_frame_decoder_listener_test_util.cc
rename to quiche/http2/test_tools/http2_frame_decoder_listener_test_util.cc
index 18a193d..fea56f2 100644
--- a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.cc
+++ b/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/decoder/http2_frame_decoder_listener_test_util.h"
+#include "quiche/http2/test_tools/http2_frame_decoder_listener_test_util.h"
 
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
 #include "quiche/http2/http2_constants.h"
diff --git a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.h b/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.h
similarity index 96%
rename from quiche/http2/decoder/http2_frame_decoder_listener_test_util.h
rename to quiche/http2/test_tools/http2_frame_decoder_listener_test_util.h
index 86cb327..db341ce 100644
--- a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.h
+++ b/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_DECODER_HTTP2_FRAME_DECODER_LISTENER_TEST_UTIL_H_
-#define QUICHE_HTTP2_DECODER_HTTP2_FRAME_DECODER_LISTENER_TEST_UTIL_H_
+#ifndef QUICHE_HTTP2_TEST_TOOLS_HTTP2_FRAME_DECODER_LISTENER_TEST_UTIL_H_
+#define QUICHE_HTTP2_TEST_TOOLS_HTTP2_FRAME_DECODER_LISTENER_TEST_UTIL_H_
 
 #include <stddef.h>
 
@@ -151,4 +151,4 @@
 
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_DECODER_HTTP2_FRAME_DECODER_LISTENER_TEST_UTIL_H_
+#endif  // QUICHE_HTTP2_TEST_TOOLS_HTTP2_FRAME_DECODER_LISTENER_TEST_UTIL_H_
diff --git a/quiche/http2/decoder/http2_structure_decoder_test_util.cc b/quiche/http2/test_tools/http2_structure_decoder_test_util.cc
similarity index 87%
rename from quiche/http2/decoder/http2_structure_decoder_test_util.cc
rename to quiche/http2/test_tools/http2_structure_decoder_test_util.cc
index 877d517..214fd85 100644
--- a/quiche/http2/decoder/http2_structure_decoder_test_util.cc
+++ b/quiche/http2/test_tools/http2_structure_decoder_test_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/decoder/http2_structure_decoder_test_util.h"
+#include "quiche/http2/test_tools/http2_structure_decoder_test_util.h"
 
 #include <cstddef>
 
diff --git a/quiche/http2/decoder/http2_structure_decoder_test_util.h b/quiche/http2/test_tools/http2_structure_decoder_test_util.h
similarity index 74%
rename from quiche/http2/decoder/http2_structure_decoder_test_util.h
rename to quiche/http2/test_tools/http2_structure_decoder_test_util.h
index eb9105d..ad367c3 100644
--- a/quiche/http2/decoder/http2_structure_decoder_test_util.h
+++ b/quiche/http2/test_tools/http2_structure_decoder_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_DECODER_HTTP2_STRUCTURE_DECODER_TEST_UTIL_H_
-#define QUICHE_HTTP2_DECODER_HTTP2_STRUCTURE_DECODER_TEST_UTIL_H_
+#ifndef QUICHE_HTTP2_TEST_TOOLS_HTTP2_STRUCTURE_DECODER_TEST_UTIL_H_
+#define QUICHE_HTTP2_TEST_TOOLS_HTTP2_STRUCTURE_DECODER_TEST_UTIL_H_
 
 #include "quiche/http2/decoder/http2_structure_decoder.h"
 #include "quiche/http2/test_tools/http2_random.h"
@@ -21,4 +21,4 @@
 }  // namespace test
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_DECODER_HTTP2_STRUCTURE_DECODER_TEST_UTIL_H_
+#endif  // QUICHE_HTTP2_TEST_TOOLS_HTTP2_STRUCTURE_DECODER_TEST_UTIL_H_
diff --git a/quiche/http2/http2_structures_test_util.cc b/quiche/http2/test_tools/http2_structures_test_util.cc
similarity index 95%
rename from quiche/http2/http2_structures_test_util.cc
rename to quiche/http2/test_tools/http2_structures_test_util.cc
index fbff7ea..09bf1ee 100644
--- a/quiche/http2/http2_structures_test_util.cc
+++ b/quiche/http2/test_tools/http2_structures_test_util.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
 
 #include <cstdint>
 
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_constants_test_util.h"
 #include "quiche/http2/http2_structures.h"
+#include "quiche/http2/test_tools/http2_constants_test_util.h"
 #include "quiche/http2/test_tools/http2_random.h"
 
 namespace http2 {
diff --git a/quiche/http2/http2_structures_test_util.h b/quiche/http2/test_tools/http2_structures_test_util.h
similarity index 91%
rename from quiche/http2/http2_structures_test_util.h
rename to quiche/http2/test_tools/http2_structures_test_util.h
index ec4b9d7..5a5353e 100644
--- a/quiche/http2/http2_structures_test_util.h
+++ b/quiche/http2/test_tools/http2_structures_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_HTTP2_STRUCTURES_TEST_UTIL_H_
-#define QUICHE_HTTP2_HTTP2_STRUCTURES_TEST_UTIL_H_
+#ifndef QUICHE_HTTP2_TEST_TOOLS_HTTP2_STRUCTURES_TEST_UTIL_H_
+#define QUICHE_HTTP2_TEST_TOOLS_HTTP2_STRUCTURES_TEST_UTIL_H_
 
 #include <string>
 
@@ -58,4 +58,4 @@
 }  // namespace test
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_HTTP2_STRUCTURES_TEST_UTIL_H_
+#endif  // QUICHE_HTTP2_TEST_TOOLS_HTTP2_STRUCTURES_TEST_UTIL_H_
diff --git a/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.cc b/quiche/http2/test_tools/payload_decoder_base_test_util.cc
similarity index 94%
rename from quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.cc
rename to quiche/http2/test_tools/payload_decoder_base_test_util.cc
index 8fcd2b0..5467658 100644
--- a/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.cc
+++ b/quiche/http2/test_tools/payload_decoder_base_test_util.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
+#include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
 
-#include "quiche/http2/decoder/frame_decoder_state_test_util.h"
-#include "quiche/http2/http2_structures_test_util.h"
+#include "quiche/http2/test_tools/frame_decoder_state_test_util.h"
+#include "quiche/http2/test_tools/http2_structures_test_util.h"
 #include "quiche/common/platform/api/quiche_test.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h b/quiche/http2/test_tools/payload_decoder_base_test_util.h
similarity index 98%
rename from quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h
rename to quiche/http2/test_tools/payload_decoder_base_test_util.h
index b76f1a0..5f65982 100644
--- a/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h
+++ b/quiche/http2/test_tools/payload_decoder_base_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_DECODER_PAYLOAD_DECODERS_PAYLOAD_DECODER_BASE_TEST_UTIL_H_
-#define QUICHE_HTTP2_DECODER_PAYLOAD_DECODERS_PAYLOAD_DECODER_BASE_TEST_UTIL_H_
+#ifndef QUICHE_HTTP2_TEST_TOOLS_PAYLOAD_DECODER_BASE_TEST_UTIL_H_
+#define QUICHE_HTTP2_TEST_TOOLS_PAYLOAD_DECODER_BASE_TEST_UTIL_H_
 
 // Base class for testing concrete payload decoder classes.
 
@@ -17,9 +17,9 @@
 #include "quiche/http2/decoder/frame_decoder_state.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
 #include "quiche/http2/http2_constants.h"
-#include "quiche/http2/http2_constants_test_util.h"
 #include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts.h"
+#include "quiche/http2/test_tools/http2_constants_test_util.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/random_decoder_test.h"
 #include "quiche/common/platform/api/quiche_export.h"
@@ -438,4 +438,4 @@
 }  // namespace test
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_DECODER_PAYLOAD_DECODERS_PAYLOAD_DECODER_BASE_TEST_UTIL_H_
+#endif  // QUICHE_HTTP2_TEST_TOOLS_PAYLOAD_DECODER_BASE_TEST_UTIL_H_