--- hedwig-client/src/main/cpp/test/Makefile.am	2012-11-02 21:47:32.000000000 +0100
+++ hedwig-client/src/main/cpp/test/Makefile.am-gil	2013-06-11 18:33:46.335004441 +0200
@@ -19,10 +19,10 @@
 if HAVE_GTEST
 bin_PROGRAMS = hedwigtest
 hedwigtest_SOURCES = main.cpp utiltest.cpp publishtest.cpp subscribetest.cpp pubsubtest.cpp messageboundtest.cpp messagefiltertest.cpp throttledeliverytest.cpp multiplextest.cpp
-hedwigtest_CPPFLAGS = -I$(top_srcdir)/inc $(DEPS_CFLAGS) $(GTEST_CPPFLAGS) $(BOOST_CPPFLAGS)
-hedwigtest_CXXFLAGS = $(GTEST_CXXFLAGS)
+hedwigtest_CPPFLAGS = -I$(top_srcdir)/inc $(DEPS_CFLAGS) $(GTEST_CPPFLAGS) $(BOOST_CPPFLAGS) -fPIE
+hedwigtest_CXXFLAGS = $(GTEST_CXXFLAGS) -fPIE
 hedwigtest_LDADD = $(DEPS_LIBS) $(GTEST_LIBS) -L$(top_builddir)/lib -lhedwig01
-hedwigtest_LDFLAGS = -no-undefined $(BOOST_ASIO_LIB) $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB) $(GTEST_LDFLAGS)
+hedwigtest_LDFLAGS = -no-undefined $(BOOST_ASIO_LIB) $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB) $(GTEST_LDFLAGS) -pie -Wl,-z,relro -Wl,-z,now
 
 check: hedwigtest
 	bash ../scripts/tester.sh all