diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 46af69a9bfdb..1393ab22a6e4 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -1,4 +1,3 @@
-CONFIG_UAPI_HEADER_TEST=y
 CONFIG_LOCALVERSION="-mainline"
 CONFIG_AUDIT=y
 CONFIG_NO_HZ=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 6e8ae77cf0d5..6546b7b264a6 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -1,4 +1,3 @@
-CONFIG_UAPI_HEADER_TEST=y
 CONFIG_LOCALVERSION="-mainline"
 CONFIG_KERNEL_LZ4=y
 # CONFIG_USELIB is not set