diff --git a/test/include/dbus_utility_test.cpp b/test/include/dbus_utility_test.cpp
index c6b02c6..eb8ac17 100644
--- a/test/include/dbus_utility_test.cpp
+++ b/test/include/dbus_utility_test.cpp
@@ -2,11 +2,7 @@
 
 #include <string>
 
-#include <gtest/gtest.h> // IWYU pragma: keep
-
-// IWYU pragma: no_include <gtest/gtest-message.h>
-// IWYU pragma: no_include <gtest/gtest-test-part.h>
-// IWYU pragma: no_include "gtest/gtest_pred_impl.h"
+#include <gtest/gtest.h>
 
 namespace dbus::utility
 {
diff --git a/test/include/http_utility_test.cpp b/test/include/http_utility_test.cpp
index d2060c1..d4823da 100644
--- a/test/include/http_utility_test.cpp
+++ b/test/include/http_utility_test.cpp
@@ -2,11 +2,7 @@
 
 #include <array>
 
-#include <gtest/gtest.h> // IWYU pragma: keep
-
-// IWYU pragma: no_include <gtest/gtest-message.h>
-// IWYU pragma: no_include <gtest/gtest-test-part.h>
-// IWYU pragma: no_include "gtest/gtest_pred_impl.h"
+#include <gtest/gtest.h>
 
 namespace http_helpers
 {
diff --git a/test/include/human_sort_test.cpp b/test/include/human_sort_test.cpp
index 741fb3d..dec8a52 100644
--- a/test/include/human_sort_test.cpp
+++ b/test/include/human_sort_test.cpp
@@ -3,13 +3,8 @@
 #include <set>
 #include <string>
 
-#include <gmock/gmock.h> // IWYU pragma: keep
-#include <gtest/gtest.h> // IWYU pragma: keep
-
-// IWYU pragma: no_include <gtest/gtest-message.h>
-// IWYU pragma: no_include <gtest/gtest-test-part.h>
-// IWYU pragma: no_include "gtest/gtest_pred_impl.h"
-// IWYU pragma: no_include <gmock/gmock-matchers.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace
 {
diff --git a/test/include/ibm/configfile_test.cpp b/test/include/ibm/configfile_test.cpp
index 1d95a79..f6f042d 100644
--- a/test/include/ibm/configfile_test.cpp
+++ b/test/include/ibm/configfile_test.cpp
@@ -3,11 +3,7 @@
 
 #include <string>
 
-#include <gtest/gtest.h> // IWYU pragma: keep
-
-// IWYU pragma: no_include <gtest/gtest-message.h>
-// IWYU pragma: no_include <gtest/gtest-test-part.h>
-// IWYU pragma: no_include "gtest/gtest_pred_impl.h"
+#include <gtest/gtest.h>
 
 namespace crow
 {
diff --git a/test/include/json_html_serializer.cpp b/test/include/json_html_serializer.cpp
index 82e21b9..5aebb3a 100644
--- a/test/include/json_html_serializer.cpp
+++ b/test/include/json_html_serializer.cpp
@@ -4,11 +4,7 @@
 
 #include <string>
 
-#include <gtest/gtest.h> // IWYU pragma: keep
-
-// IWYU pragma: no_include <gtest/gtest-message.h>
-// IWYU pragma: no_include <gtest/gtest-test-part.h>
-// IWYU pragma: no_include "gtest/gtest_pred_impl.h"
+#include <gtest/gtest.h>
 
 namespace json_html_util
 {
diff --git a/test/include/multipart_test.cpp b/test/include/multipart_test.cpp
index 9e79dbd..c294b7b 100644
--- a/test/include/multipart_test.cpp
+++ b/test/include/multipart_test.cpp
@@ -8,14 +8,7 @@
 #include <system_error>
 #include <vector>
 
-#include <gtest/gtest.h> // IWYU pragma: keep
-
-// IWYU pragma: no_include <gtest/gtest-message.h>
-// IWYU pragma: no_include <gtest/gtest-test-part.h>
-// IWYU pragma: no_include "gtest/gtest_pred_impl.h"
-// IWYU pragma: no_include <boost/beast/http/impl/fields.hpp>
-// IWYU pragma: no_include <boost/intrusive/detail/list_iterator.hpp>
-// IWYU pragma: no_include <boost/intrusive/detail/tree_iterator.hpp>
+#include <gtest/gtest.h>
 
 namespace
 {
diff --git a/test/include/openbmc_dbus_rest_test.cpp b/test/include/openbmc_dbus_rest_test.cpp
index b01e92a..7efd10d 100644
--- a/test/include/openbmc_dbus_rest_test.cpp
+++ b/test/include/openbmc_dbus_rest_test.cpp
@@ -1,12 +1,7 @@
 #include "openbmc_dbus_rest.hpp"
 
-#include <gmock/gmock.h> // IWYU pragma: keep
-#include <gtest/gtest.h> // IWYU pragma: keep
-
-// IWYU pragma: no_include <gtest/gtest-message.h>
-// IWYU pragma: no_include <gtest/gtest-test-part.h>
-// IWYU pragma: no_include "gtest/gtest_pred_impl.h"
-// IWYU pragma: no_include <gmock/gmock-matchers.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace crow::openbmc_mapper
 {
diff --git a/test/include/ossl_random.cpp b/test/include/ossl_random.cpp
index 1b9a2b8..f0c7697 100644
--- a/test/include/ossl_random.cpp
+++ b/test/include/ossl_random.cpp
@@ -1,7 +1,7 @@
 #include "ossl_random.hpp"
 
-#include <gmock/gmock.h> // IWYU pragma: keep
-#include <gtest/gtest.h> // IWYU pragma: keep
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace
 {
diff --git a/test/include/str_utility_test.cpp b/test/include/str_utility_test.cpp
index c52cab9..a214d31 100644
--- a/test/include/str_utility_test.cpp
+++ b/test/include/str_utility_test.cpp
@@ -3,13 +3,8 @@
 #include <string>
 #include <vector>
 
-#include <gmock/gmock.h> // IWYU pragma: keep
-#include <gtest/gtest.h> // IWYU pragma: keep
-
-// IWYU pragma: no_include <gtest/gtest-message.h>
-// IWYU pragma: no_include <gtest/gtest-test-part.h>
-// IWYU pragma: no_include "gtest/gtest_pred_impl.h"
-// IWYU pragma: no_include <gmock/gmock-matchers.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace
 {