diff --git a/build_gateway.inc b/build_gateway.inc
index 0e1d6b75f..e82e7fd19 100644
--- a/build_gateway.inc
+++ b/build_gateway.inc
@@ -52,3 +52,8 @@ endif
 # 
 ERRMSG := $(HOME)/usr/share/mysql
 
+#
+# Build optional RabbitMQ filter
+# Requires librabbitmq-devel
+# 
+BUILD_RABBITMQ :=
diff --git a/query_classifier/test/canonical_tests/Makefile b/query_classifier/test/canonical_tests/Makefile
index 4da0ec962..c5fe44fe9 100644
--- a/query_classifier/test/canonical_tests/Makefile
+++ b/query_classifier/test/canonical_tests/Makefile
@@ -26,7 +26,7 @@ LDFLAGS=-L$(QUERY_CLASSIFIER_PATH) \
 	-Wl,-rpath,$(LOG_MANAGER_PATH) \
 	-Wl,-rpath,$(QUERY_CLASSIFIER_PATH)
 
-LIBS=-lstdc++ -lpthread -lquery_classifier -lz -ldl -lssl -laio -lcrypt -lcrypto -lrt \
+LIBS=-lstdc++ -lpthread -lquery_classifier -lz -ldl -lssl -laio -lcrypt -lcrypto -lrt -lm \
 	-llog_manager $(UTILS_PATH)/skygw_utils.o $(CORE_PATH)/buffer.o $(CORE_PATH)/atomic.o $(CORE_PATH)/spinlock.o $(CORE_PATH)/hint.o
 
 CFLAGS=-g $(MYSQL_HEADERS) \
@@ -35,8 +35,6 @@ CFLAGS=-g $(MYSQL_HEADERS) \
 	-I$(ROOT_PATH)/server/include \
 	-I$(UTILS_PATH)
 
-EMBFLAGS=$(shell mysql_config --cflags --libmysqld-libs)
-
 
 testall:
 	$(MAKE) cleantests
@@ -52,7 +50,7 @@ cleantests:
 
 buildtests: $(OBJS)
 	cp $(ERRMSG)/errmsg.sys .
-	$(CC) $(CFLAGS) $(LDFLAGS) $(EMBFLAGS) $(LIBS) canonizer.c -o $(TESTAPP)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) canonizer.c -o $(TESTAPP) $(LDLIBS) $(LDMYSQL)
 
 runtests:
 	@echo ""				>  $(TESTLOG)