diff --git a/Makefile b/Makefile
index 1512fe5d..e6ad796b 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,8 @@ mg_prefix: mongoose.c mongoose.h
 	$(CLANG) mongoose.c $(CFLAGS) -c -o /tmp/x.o && nm /tmp/x.o | grep ' T' | grep -v 'mg_' ; test $$? = 1
 
 # C++ build
-test++: CLANG = g++ -Wno-deprecated -Wno-missing-field-initializers
+test++: CLANG = g++ -Wno-deprecated
+test++: WARN += -Wno-shadow
 test++: unamalgamated
 
 # Make sure we can build from an unamalgamated sources