diff --git a/.travis.yml b/.travis.yml
index a7e4840..b5d9db0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ os:
   - linux
   - osx
 env:
-  - DEFINES=standard
-  - DEFINES=PUGIXML_WCHAR_MODE
-  - DEFINES=PUGIXML_COMPACT
+  - DEFINES=PUGIXML_NO_CXX11
+  - DEFINES=PUGIXML_NO_CXX11,PUGIXML_WCHAR_MODE
+  - DEFINES=PUGIXML_NO_CXX11,PUGIXML_COMPACT
 script:
   - make test config=coverage defines=$DEFINES -j2
   - make test config=release defines=$DEFINES -j2
diff --git a/Makefile b/Makefile
index 777b82b..a7624f9 100644
--- a/Makefile
+++ b/Makefile
@@ -47,9 +47,10 @@ ifneq ($(findstring PUGIXML_NO_EXCEPTIONS,$(defines)),)
 	CXXFLAGS+=-fno-exceptions
 endif
 
-ifeq ($(findstring PUGIXML_NO_CXX11,$(defines)),)
-	# Can't use std=c++11 since Travis-CI has gcc 4.6.3
-	CXXFLAGS+=-std=c++0x
+ifneq ($(findstring PUGIXML_NO_CXX11,$(defines)),)
+	CXXFLAGS+=-std=c++03
+else
+	CXXFLAGS+=-std=c++11
 endif
 
 OBJECTS=$(SOURCES:%=$(BUILD)/%.o)
diff --git a/tests/test_parse.cpp b/tests/test_parse.cpp
index 47f774e..bf7a2d1 100644
--- a/tests/test_parse.cpp
+++ b/tests/test_parse.cpp
@@ -1181,4 +1181,4 @@ TEST(parse_embed_pcdata)
 		CHECK_NODE_EX(doc, STR("<node>\n<key>value</key>\n<child>\n<inner1>value1</inner1>\n<inner2>value2</inner2>outer</child>\n<two>text<data />\n</two>\n</node>\n"), STR("\t"), 0);
 		CHECK_NODE_EX(doc, STR("<node>\n\t<key>value</key>\n\t<child>\n\t\t<inner1>value1</inner1>\n\t\t<inner2>value2</inner2>outer</child>\n\t<two>text<data />\n\t</two>\n</node>\n"), STR("\t"), format_indent);
 	}
-}
\ No newline at end of file
+}