diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
index 93c917d..a9dfb9e 100644
--- a/cmake/protobuf.cmake
+++ b/cmake/protobuf.cmake
@@ -121,10 +121,14 @@ MACRO(MYSQL_CHECK_PROTOBUF)
   IF(WITH_PROTOBUF STREQUAL "bundled")
     MYSQL_USE_BUNDLED_PROTOBUF()
   ELSE()
-    FIND_PACKAGE(Protobuf)
+    FIND_PACKAGE(protobuf REQUIRED CONFIG)
   ENDIF()
 
-  IF(NOT PROTOBUF_FOUND)
+  SET(PROTOBUF_LIBRARY "protobuf::libprotobuf")
+  SET(PROTOBUF_PROTOC_EXECUTABLE "protobuf::protoc")
+  SET(PROTOBUF_PROTOC_LIBRARY "protobuf::libprotoc")
+
+  IF(NOT protobuf_FOUND)
     MESSAGE(WARNING "Protobuf libraries/headers could not be found")
   ENDIF()
 
@@ -136,7 +140,7 @@ MACRO(MYSQL_CHECK_PROTOBUF)
     MESSAGE(WARNING "The protoc library could not be found")
   ENDIF()
 
-  IF(NOT PROTOBUF_FOUND OR
+  IF(NOT protobuf_FOUND OR
       NOT PROTOBUF_PROTOC_EXECUTABLE OR
       NOT PROTOBUF_PROTOC_LIBRARY)
     MESSAGE(FATAL_ERROR "Use bundled protobuf, or install missing packages")
diff --git a/plugin/x/tests/driver/connector/connection_manager.cc b/plugin/x/tests/driver/connector/connection_manager.cc
index 1cdacaa..d29d338 100644
--- a/plugin/x/tests/driver/connector/connection_manager.cc
+++ b/plugin/x/tests/driver/connector/connection_manager.cc
@@ -33,8 +33,6 @@
 
 #include "plugin/x/tests/driver/processor/variable_names.h"
 
-google::protobuf::LogHandler *g_lh = nullptr;
-
 Connection_manager::Connection_manager(const Connection_options &co,
                                        Variable_container *variables,
                                        const Console &console_with_flow_history,
@@ -43,14 +41,6 @@ Connection_manager::Connection_manager(const Connection_options &co,
       m_variables(variables),
       m_console_with_flow_history(console_with_flow_history),
       m_console(console) {
-  g_lh = google::protobuf::SetLogHandler([](google::protobuf::LogLevel level,
-                                            const char *filename, int line,
-                                            const std::string &message) {
-    if (g_lh) g_lh(level, filename, line, message);
-    DBUG_LOG("debug",
-             "Protobuf error (level:" << level << ", filename:" << filename
-                                      << ":" << line << ", text:" << message);
-  });
   m_variables->make_special_variable(
       k_variable_option_user,
       new Variable_dynamic_string(m_default_connection_options.user));