diff --git a/http2/http2_constants_test.cc b/http2/http2_constants_test.cc
index 223082a..389c698 100644
--- a/http2/http2_constants_test.cc
+++ b/http2/http2_constants_test.cc
@@ -4,7 +4,7 @@
 
 #include "net/third_party/quiche/src/http2/http2_constants.h"
 
-#include "testing/gtest/include/gtest/gtest.h"
+#include "net/third_party/quiche/src/http2/platform/api/http2_test_helpers.h"
 
 namespace http2 {
 namespace test {
diff --git a/http2/http2_structures_test.cc b/http2/http2_structures_test.cc
index 06ddc75..a837180 100644
--- a/http2/http2_structures_test.cc
+++ b/http2/http2_structures_test.cc
@@ -19,8 +19,6 @@
 #include <type_traits>
 #include <vector>
 
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "net/third_party/quiche/src/http2/http2_structures_test_util.h"
 #include "net/third_party/quiche/src/http2/platform/api/http2_string_utils.h"
 #include "net/third_party/quiche/src/http2/platform/api/http2_test_helpers.h"
diff --git a/http2/http2_structures_test_util.h b/http2/http2_structures_test_util.h
index 77127a1..1b3e4c5 100644
--- a/http2/http2_structures_test_util.h
+++ b/http2/http2_structures_test_util.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "testing/gtest/include/gtest/gtest.h"
 #include "net/third_party/quiche/src/http2/http2_structures.h"
+#include "net/third_party/quiche/src/http2/platform/api/http2_test_helpers.h"
 #include "net/third_party/quiche/src/http2/test_tools/http2_random.h"
 #include "net/third_party/quiche/src/http2/tools/http2_frame_builder.h"
 
diff --git a/http2/platform/api/http2_test_helpers.h b/http2/platform/api/http2_test_helpers.h
index a54f4ab..4a616f7 100644
--- a/http2/platform/api/http2_test_helpers.h
+++ b/http2/platform/api/http2_test_helpers.h
@@ -5,8 +5,14 @@
 // an AssertionResult if the condition is not satisfied.
 #include "net/http2/platform/impl/http2_test_helpers_impl.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Weverything"
+
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"  // For AssertionSuccess
 
+#pragma clang diagnostic pop
+
 #define VERIFY_AND_RETURN_SUCCESS(expression) \
   {                                           \
     VERIFY_SUCCESS(expression);               \