diff --git a/query_classifier/test/compare.cc b/query_classifier/test/compare.cc
index 5bea5f224..e60107ce2 100644
--- a/query_classifier/test/compare.cc
+++ b/query_classifier/test/compare.cc
@@ -20,6 +20,7 @@
 #include <set>
 #include <string>
 #include <sstream>
+#include <my_config.h>
 #include <maxscale/paths.h>
 #include <maxscale/log.hh>
 #include <maxscale/protocol/mysql.hh>
diff --git a/query_classifier/test/create.test b/query_classifier/test/create.test
index eac0ad06b..4d6d62f2c 100644
--- a/query_classifier/test/create.test
+++ b/query_classifier/test/create.test
@@ -981,7 +981,8 @@ set names utf8;
 # MXS: qc_get_type              : ERR: QUERY_TYPE_WRITE != QUERY_TYPE_WRITE|QUERY_TYPE_COMMIT
 # MXS: qc_get_operation         : ERR: QUERY_OP_UNDEFINED != QUERY_OP_CREATE
 # MXS: qc_mysqlembedded sees the type as SQLCOM_END when figuring out the type.
-use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+# MXS: use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+# MXS: qc_get_database_names    : ERR: Ð != имя_базы_в_кодировке_утф8_длиной_больше_чем_45
 select database();
 use test;