diff --git a/Makefile.mk b/Makefile.mk
index 4a2f1918acd..18ec01af490 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -515,7 +515,6 @@ CFLAGS_common += -Wstrict-prototypes
 CFLAGS_common += -Wmissing-prototypes
 CFLAGS_common += -Wwrite-strings
 CFLAGS_common += -Wredundant-decls
-CFLAGS_common += -Wno-trigraphs
 CFLAGS_common += -Wimplicit-fallthrough
 CFLAGS_common += -Wshadow
 CFLAGS_common += -Wdate-time
diff --git a/payloads/libpayload/Makefile.mk b/payloads/libpayload/Makefile.mk
index 6dd33e11974..c9cefb31eca 100644
--- a/payloads/libpayload/Makefile.mk
+++ b/payloads/libpayload/Makefile.mk
@@ -78,7 +78,7 @@ CFLAGS += $(INCLUDES) -Os -pipe -nostdinc -ggdb3
 CFLAGS += -nostdlib -fno-builtin -ffreestanding -fomit-frame-pointer
 CFLAGS += -ffunction-sections -fdata-sections
 CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wvla
-CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs -Wimplicit-fallthrough
+CFLAGS += -Wwrite-strings -Wredundant-decls -Wimplicit-fallthrough
 CFLAGS += -Wstrict-aliasing -Wshadow -Werror
 
 ifeq ($(CONFIG_LP_LTO),y)
diff --git a/payloads/libpayload/tests/Makefile.mk b/payloads/libpayload/tests/Makefile.mk
index 71189068507..01f0a9ec8d1 100644
--- a/payloads/libpayload/tests/Makefile.mk
+++ b/payloads/libpayload/tests/Makefile.mk
@@ -44,7 +44,7 @@ TEST_CFLAGS += -I$(cmockasrc)/include
 
 # Minimal subset of warnings and errors. Tests can be less strict than actual build.
 TEST_CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wvla
-TEST_CFLAGS += -Wwrite-strings -Wno-trigraphs -Wimplicit-fallthrough
+TEST_CFLAGS += -Wwrite-strings -Wimplicit-fallthrough
 TEST_CFLAGS += -Wstrict-aliasing -Wshadow -Werror
 TEST_CFLAGS += -Wno-unknown-warning-option -Wno-source-mgr -Wno-main-return-type
 
diff --git a/tests/Makefile.common b/tests/Makefile.common
index e856fe07c13..dd7cca29f40 100644
--- a/tests/Makefile.common
+++ b/tests/Makefile.common
@@ -48,7 +48,7 @@ TEST_INCLUDES += -I$(dir $(TEST_KCONFIG_AUTOHEADER))
 # unintentional.
 TEST_CFLAGS += -Wall -Werror -Wundef -Wstrict-prototypes -Wno-inline-asm
 TEST_CFLAGS += -Wno-unknown-warning-option -Wno-source-mgr -Wno-main-return-type
-TEST_CFLAGS += -Wno-array-compare -Wno-packed-not-aligned -Wno-trigraphs
+TEST_CFLAGS += -Wno-array-compare -Wno-trigraphs
 TEST_CFLAGS += -Wno-unused-but-set-variables
 
 TEST_CFLAGS += -std=gnu11 -ffunction-sections -fdata-sections -fno-builtin