diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am
index 95574fc..b7ef15b 100755
--- a/test/cpp/Makefile.am
+++ b/test/cpp/Makefile.am
@@ -96,7 +96,7 @@
 	-I$(top_srcdir)/lib/cpp/src -Igen-cpp
 
 AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
-AM_CXXFLAGS = -Wall
+AM_CXXFLAGS = -Wall -Wextra -std=c++0x -pedantic
 AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)
 
 clean-local: