diff --git a/test/http/crow_getroutes_test.cpp b/test/http/crow_getroutes_test.cpp
index 0c3f8de..dc6e427 100644
--- a/test/http/crow_getroutes_test.cpp
+++ b/test/http/crow_getroutes_test.cpp
@@ -4,15 +4,8 @@
 
 #include <memory>
 
-#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>
-// IWYU pragma: no_include <gmock/gmock-more-matchers.h>
-// IWYU pragma: no_include <gtest/gtest-matchers.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace crow
 {
diff --git a/test/http/mutual_tls.cpp b/test/http/mutual_tls.cpp
index e354466..bb3cbbf 100644
--- a/test/http/mutual_tls.cpp
+++ b/test/http/mutual_tls.cpp
@@ -21,7 +21,7 @@
 #include <memory>
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h> // IWYU pragma: keep
+#include <gtest/gtest.h>
 
 using ::testing::IsNull;
 using ::testing::NotNull;
diff --git a/test/http/mutual_tls_meta.cpp b/test/http/mutual_tls_meta.cpp
index 0e280c1..918a9c9 100644
--- a/test/http/mutual_tls_meta.cpp
+++ b/test/http/mutual_tls_meta.cpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include <gtest/gtest.h> // IWYU pragma: keep
+#include <gtest/gtest.h>
 
 namespace redfish
 {
diff --git a/test/http/router_test.cpp b/test/http/router_test.cpp
index e0e5b7a..5430872 100644
--- a/test/http/router_test.cpp
+++ b/test/http/router_test.cpp
@@ -1,9 +1,8 @@
-#include "async_resp.hpp" // IWYU pragma: keep
+#include "async_resp.hpp"
 #include "http_request.hpp"
 #include "routing.hpp"
 #include "utility.hpp"
 
-#include <boost/beast/http/message.hpp> // IWYU pragma: keep
 #include <boost/beast/http/verb.hpp>
 
 #include <memory>
@@ -11,13 +10,8 @@
 #include <string_view>
 #include <system_error>
 
-#include <gtest/gtest.h> // IWYU pragma: keep
+#include <gtest/gtest.h>
 
-// IWYU pragma: no_include <boost/beast/http/impl/message.hpp>
-// IWYU pragma: no_include "gtest/gtest_pred_impl.h"
-// IWYU pragma: no_include <boost/intrusive/detail/list_iterator.hpp>
-// IWYU pragma: no_include <gtest/gtest-message.h>
-// IWYU pragma: no_include <gtest/gtest-test-part.h>
 // IWYU pragma: no_forward_declare bmcweb::AsyncResp
 
 namespace crow
diff --git a/test/http/utility_test.cpp b/test/http/utility_test.cpp
index f5ae5b1..36725ef 100644
--- a/test/http/utility_test.cpp
+++ b/test/http/utility_test.cpp
@@ -12,10 +12,7 @@
 #include <string>
 #include <string_view>
 
-#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::utility
 {
diff --git a/test/http/verb_test.cpp b/test/http/verb_test.cpp
index 698e39c..c2faab3 100644
--- a/test/http/verb_test.cpp
+++ b/test/http/verb_test.cpp
@@ -6,7 +6,7 @@
 #include <optional>
 #include <string_view>
 
-#include <gtest/gtest.h> // IWYU pragma: keep
+#include <gtest/gtest.h>
 
 using BoostVerb = boost::beast::http::verb;
 
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
 {
diff --git a/test/redfish-core/include/privileges_test.cpp b/test/redfish-core/include/privileges_test.cpp
index fe098ed..0005f57 100644
--- a/test/redfish-core/include/privileges_test.cpp
+++ b/test/redfish-core/include/privileges_test.cpp
@@ -4,14 +4,8 @@
 
 #include <array>
 
-#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>
-// IWYU pragma: no_include <gmock/gmock-more-matchers.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace redfish
 {
diff --git a/test/redfish-core/include/redfish_aggregator_test.cpp b/test/redfish-core/include/redfish_aggregator_test.cpp
index 5274e1b..9d8ea07 100644
--- a/test/redfish-core/include/redfish_aggregator_test.cpp
+++ b/test/redfish-core/include/redfish_aggregator_test.cpp
@@ -12,7 +12,7 @@
 #include <string>
 #include <utility>
 
-#include <gtest/gtest.h> // IWYU pragma: keep
+#include <gtest/gtest.h>
 
 namespace redfish
 {
diff --git a/test/redfish-core/include/registries_test.cpp b/test/redfish-core/include/registries_test.cpp
index 25f2c60..692d2d4 100644
--- a/test/redfish-core/include/registries_test.cpp
+++ b/test/redfish-core/include/registries_test.cpp
@@ -1,11 +1,7 @@
 #include "registries.hpp"
 #include "registries/openbmc_message_registry.hpp"
 
-#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 redfish::registries
 {
diff --git a/test/redfish-core/include/utils/hex_utils_test.cpp b/test/redfish-core/include/utils/hex_utils_test.cpp
index a4ff5b7..a4b376c 100644
--- a/test/redfish-core/include/utils/hex_utils_test.cpp
+++ b/test/redfish-core/include/utils/hex_utils_test.cpp
@@ -5,13 +5,8 @@
 #include <limits>
 #include <vector>
 
-#include <gmock/gmock.h> // IWYU pragma: keep
-#include <gtest/gtest.h> // IWYU pragma: keep
-
-// IWYU pragma: no_include "gtest/gtest_pred_impl.h"
-// 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 <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace
 {
diff --git a/test/redfish-core/include/utils/ip_utils_test.cpp b/test/redfish-core/include/utils/ip_utils_test.cpp
index 67cacc0..0cfe4cb 100644
--- a/test/redfish-core/include/utils/ip_utils_test.cpp
+++ b/test/redfish-core/include/utils/ip_utils_test.cpp
@@ -4,11 +4,7 @@
 
 #include <cstdint>
 
-#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 redfish::ip_util
 {
diff --git a/test/redfish-core/include/utils/json_utils_test.cpp b/test/redfish-core/include/utils/json_utils_test.cpp
index cf59297..2238728 100644
--- a/test/redfish-core/include/utils/json_utils_test.cpp
+++ b/test/redfish-core/include/utils/json_utils_test.cpp
@@ -14,13 +14,8 @@
 #include <variant>
 #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 <boost/intrusive/detail/list_iterator.hpp>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace redfish::json_util
 {
diff --git a/test/redfish-core/include/utils/query_param_test.cpp b/test/redfish-core/include/utils/query_param_test.cpp
index b466f81..6c6524d 100644
--- a/test/redfish-core/include/utils/query_param_test.cpp
+++ b/test/redfish-core/include/utils/query_param_test.cpp
@@ -17,15 +17,8 @@
 #include <utility>
 #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 <boost/url/impl/url_view.hpp>
-// IWYU pragma: no_include <gmock/gmock-matchers.h>
-// IWYU pragma: no_include <gtest/gtest-matchers.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace redfish::query_param
 {
diff --git a/test/redfish-core/include/utils/stl_utils_test.cpp b/test/redfish-core/include/utils/stl_utils_test.cpp
index d8c0a1c..587f835 100644
--- a/test/redfish-core/include/utils/stl_utils_test.cpp
+++ b/test/redfish-core/include/utils/stl_utils_test.cpp
@@ -3,12 +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"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace redfish::stl_utils
 {
diff --git a/test/redfish-core/include/utils/time_utils_test.cpp b/test/redfish-core/include/utils/time_utils_test.cpp
index 3777208..ca11097 100644
--- a/test/redfish-core/include/utils/time_utils_test.cpp
+++ b/test/redfish-core/include/utils/time_utils_test.cpp
@@ -6,14 +6,7 @@
 #include <limits>
 #include <optional>
 
-#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>
-// IWYU pragma: no_include <gtest/gtest-matchers.h>
+#include <gtest/gtest.h>
 
 namespace redfish::time_utils
 {
diff --git a/test/redfish-core/lib/service_root_test.cpp b/test/redfish-core/lib/service_root_test.cpp
index 02e9f20..6d0122c 100644
--- a/test/redfish-core/lib/service_root_test.cpp
+++ b/test/redfish-core/lib/service_root_test.cpp
@@ -9,14 +9,8 @@
 #include <cstddef>
 #include <memory>
 
-#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>
-// IWYU pragma: no_include <gtest/gtest-matchers.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace redfish
 {