diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp
index 9e223564c..71721b243 100644
--- a/lib/MySQL_Thread.cpp
+++ b/lib/MySQL_Thread.cpp
@@ -396,6 +396,7 @@ MySQL_Threads_Handler::MySQL_Threads_Handler() {
 	variables.monitor_groupreplication_healthcheck_interval=5000;
 	variables.monitor_groupreplication_healthcheck_timeout=800;
 	variables.monitor_groupreplication_healthcheck_timeout=800;
+	variables.monitor_groupreplication_healthcheck_max_timeout_count=3;
 	variables.monitor_galera_healthcheck_interval=5000;
 	variables.monitor_galera_healthcheck_timeout=800;
 	variables.monitor_galera_healthcheck_max_timeout_count=3;
diff --git a/test/PrepStmt/Makefile b/test/PrepStmt/Makefile
index de78f82c5..100e3a776 100644
--- a/test/PrepStmt/Makefile
+++ b/test/PrepStmt/Makefile
@@ -17,10 +17,12 @@ JEMALLOC_PATH=$(DEPS_PATH)/jemalloc/jemalloc
 JEMALLOC_IDIR=$(JEMALLOC_PATH)/include/jemalloc
 JEMALLOC_LDIR=$(JEMALLOC_PATH)/lib
 
-LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig-1.4.9
+LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig-1.7.2
 LIBCONFIG_IDIR=-I$(LIBCONFIG_PATH)/lib
 LIBCONFIG_LDIR=-L$(LIBCONFIG_PATH)/lib/.libs
 
+EV_DIR=$(DEPS_PATH)/libev/libev/
+EV_IDIR=$(EV_DIR)
 
 RE2_PATH=$(DEPS_PATH)/re2/re2
 RE2_IDIR=$(RE2_PATH)
@@ -29,7 +31,7 @@ SQLITE3_DIR=$(DEPS_PATH)/sqlite3/sqlite3
 
 IDIR=../../include
 LDIR=../../lib
-IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(DAEMONPATH_IDIR) -I$(SQLITE3_DIR)
+IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(DAEMONPATH_IDIR) -I$(SQLITE3_DIR) -I$(EV_IDIR)
 LDIRS=-L$(LDIR) -L$(JEMALLOC_LDIR) $(LIBCONFIG_LDIR) -L$(RE2_PATH)/obj -L$(MARIADB_LDIR) -L$(DAEMONPATH_LDIR)
 
 DEBUG=-DDEBUG