diff --git a/Makefile.conf b/Makefile.conf
index bdb0226..f4c1b40 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -12,6 +12,8 @@ TARGET=libpEpAdapter.a
 DEBUG=1
 PREFIX?=$(HOME)
 
+CXXFLAGS+=-std=c++11 -fPIC
+
 # Overrides
 -include $(HERE)local.conf
 
diff --git a/test/Makefile b/test/Makefile
index 759c5cc..9d4f570 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,6 +2,8 @@ include ../Makefile.conf
 
 LDFLAGS:=-L../src $(LDFLAGS)
 LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
+LDFLAGS=-L../src $(ENGINE_LIB)
+LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter -lpthread
 CXXFLAGS:=-I../src -DENGINE_TEST=$(ENGINE_TEST) $(CXXFLAGS)
 
 # Test
diff --git a/test/test_message_cache.cc b/test/test_message_cache.cc
index fc240f9..602eab1 100644
--- a/test/test_message_cache.cc
+++ b/test/test_message_cache.cc
@@ -5,6 +5,7 @@
 
 #include <iostream>
 #include <cassert>
+#include <cstring>
 #include <sys/param.h>
 #include <unistd.h>