diff --git a/grpc/include/userver/ugrpc/client/channels.hpp b/grpc/include/userver/ugrpc/client/channels.hpp
index 0ca433e986ef..10ee09edc102 100644
--- a/grpc/include/userver/ugrpc/client/channels.hpp
+++ b/grpc/include/userver/ugrpc/client/channels.hpp
@@ -3,10 +3,7 @@
 /// @file userver/ugrpc/client/channels.hpp
 /// @brief Utilities for managing gRPC connections
 
-#include <algorithm>
-
 #include <grpcpp/channel.h>
-#include <grpcpp/completion_queue.h>
 #include <grpcpp/security/credentials.h>
 
 #include <userver/engine/deadline.hpp>
diff --git a/grpc/src/ugrpc/client/channels.cpp b/grpc/src/ugrpc/client/channels.cpp
index 98bc2539766b..d4dce2826f31 100644
--- a/grpc/src/ugrpc/client/channels.cpp
+++ b/grpc/src/ugrpc/client/channels.cpp
@@ -1,5 +1,7 @@
 #include <userver/ugrpc/client/channels.hpp>
 
+#include <algorithm>
+
 #include <grpcpp/create_channel.h>
 
 #include <userver/engine/async.hpp>
diff --git a/grpc/tests/channels_test.cpp b/grpc/tests/channels_test.cpp
index 2920f8d94683..251fee991341 100644
--- a/grpc/tests/channels_test.cpp
+++ b/grpc/tests/channels_test.cpp
@@ -1,17 +1,11 @@
 #include <userver/ugrpc/client/channels.hpp>
 
-#include <userver/dynamic_config/storage_mock.hpp>
-#include <userver/dynamic_config/test_helpers.hpp>
 #include <userver/engine/async.hpp>
-#include <userver/engine/io/socket.hpp>
 #include <userver/engine/sleep.hpp>
-#include <userver/engine/task/task.hpp>
-#include <userver/logging/null_logger.hpp>
+#include <userver/engine/task/current_task.hpp>
 #include <userver/utest/utest.hpp>
-#include <userver/utils/statistics/storage.hpp>
 
-#include <../include/userver/ugrpc/client/impl/completion_queue_pool.hpp>
-#include <userver/ugrpc/client/client_factory.hpp>
+#include <userver/ugrpc/client/client_factory_settings.hpp>
 #include <userver/ugrpc/server/server.hpp>
 #include <userver/ugrpc/tests/service.hpp>
 #include <userver/ugrpc/tests/standalone_client.hpp>
diff --git a/grpc/tests/service_config_test.cpp b/grpc/tests/service_config_test.cpp
index 0068fe5f799c..44c8986c2544 100644
--- a/grpc/tests/service_config_test.cpp
+++ b/grpc/tests/service_config_test.cpp
@@ -1,17 +1,9 @@
-#include <userver/ugrpc/client/client_factory.hpp>
+#include <userver/ugrpc/client/client_factory_settings.hpp>
 
-#include <userver/dynamic_config/storage_mock.hpp>
-#include <userver/engine/task/task.hpp>
+#include <userver/engine/task/current_task.hpp>
 #include <userver/formats/json/serialize.hpp>
-#include <userver/formats/yaml/value.hpp>
-#include <userver/formats/yaml/value_builder.hpp>
-#include <userver/utest/utest.hpp>
-#include <userver/utils/statistics/storage.hpp>
-#include <userver/yaml_config/yaml_config.hpp>
 
-#include <../include/userver/ugrpc/client/impl/completion_queue_pool.hpp>
 #include <userver/ugrpc/client/channels.hpp>
-#include <userver/ugrpc/client/client_factory.hpp>
 #include <userver/ugrpc/client/impl/client_data.hpp>
 #include <userver/ugrpc/impl/to_string.hpp>
 #include <userver/ugrpc/tests/service_fixtures.hpp>