diff --git a/log_manager/test/makefile b/log_manager/test/makefile
index c781698f0..25b493e5f 100644
--- a/log_manager/test/makefile
+++ b/log_manager/test/makefile
@@ -22,6 +22,7 @@ all: testcomp testall
 testcomp:
 	$(CC) $(CFLAGS)	 \
 	-L$(LOG_MANAGER_PATH) \
+	-Wl,-rpath,$(DEST)/lib \
 	-Wl,-rpath,$(LOG_MANAGER_PATH)/ \
 	-o testlog -DSS_DEBUG \
 	-I$(SOLIDDB_SRC_PATH)/include \
@@ -30,5 +31,6 @@ testcomp:
 	-llog_manager $(LDLIBS) \
 	$(LOG_MANAGER_PATH)/skygw_utils.o \
 
+
 testall: 
 	- $(LAUNCH_DEBUGGER) $(TESTAPP) $(BACKGR)
diff --git a/query_classifier/makefile b/query_classifier/makefile
index 744a778a8..dcd786251 100644
--- a/query_classifier/makefile
+++ b/query_classifier/makefile
@@ -40,12 +40,14 @@ liblink:
 	 $(CPP) -shared \
 	-L$(MARIADB_SRC_PATH)/libmysqld \
 	-Wl,-soname,libquery_classifier.so \
+	-Wl,-rpath,$(DEST)/lib \
 	-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld \
 	-o libquery_classifier.so.1.0.1 ./query_classifier.o \
 	$(LDLIBS) $(LDMYSQL) $(CPP_LDLIBS)
 	$(DEL) ./libquery_classifier.so
 	$(LINK) ./libquery_classifier.so.1.0.1 ./libquery_classifier.so
 
+
 install: liblink
 	install ./libquery_classifier.so.1.0.1 ./libquery_classifier.so $(DEST)/lib
 
diff --git a/query_classifier/test/makefile b/query_classifier/test/makefile
index 77ac578e6..69168afdc 100644
--- a/query_classifier/test/makefile
+++ b/query_classifier/test/makefile
@@ -23,6 +23,7 @@ testcomp:
 	$(CC) $(CFLAGS)	 \
 	-L$(QUERY_CLASSIFIER_PATH) \
 	-L$(MARIADB_SRC_PATH)/libmysqld \
+	-Wl,-rpath,$(DEST)/lib \
 	-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld \
 	-Wl,-rpath,$(QUERY_CLASSIFIER_PATH)/ \
 	-o testmain -DSS_DEBUG \
@@ -30,5 +31,6 @@ testcomp:
 	-lquery_classifier $(LDLIBS) $(LDMYSQL) \
 	$(QUERY_CLASSIFIER_PATH)/skygw_utils.o
 
+
 testall: 
 	- $(LAUNCH_DEBUGGER) $(TESTAPP) $(BACKGR)