diff --git a/test/Makefile b/test/Makefile
index e08bb25b..1e16fd2c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -15,7 +15,10 @@ COMMON_HEADERS=$(COMMON_DIR)/fips202.h $(COMMON_DIR)/randombytes.h $(COMMON_DIR)
 DEST_DIR=../bin
 
 # This -Wall was supported by the European Commission through the ERC Starting Grant 805031 (EPOQUE)
-CFLAGS=-Wall -Wextra -Wpedantic -Werror -Wundef -std=c99 -I$(COMMON_DIR) $(EXTRAFLAGS)
+CFLAGS=-Wall -Wextra -Wpedantic -Werror -std=c99 \
+	   -Wundef -Wshadow -Wcast-align -Wpointer-arith \
+	   -fstrict-aliasing -fno-common -pipe \
+	   -I$(COMMON_DIR) $(EXTRAFLAGS)
 
 all: $(DEST_DIR)/functest_$(SCHEME)_$(IMPLEMENTATION) $(DEST_DIR)/testvectors_$(SCHEME)_$(IMPLEMENTATION)