diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules
deleted file mode 100644
index a6c3f332d9c3..000000000000
--- a/android/gki_aarch64_modules
+++ /dev/null
@@ -1 +0,0 @@
-lib/test_stackinit.ko
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index c4db77fb35df..34e5bc42c483 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -679,4 +679,4 @@ CONFIG_HIST_TRIGGERS=y
 CONFIG_PID_IN_CONTEXTIDR=y
 CONFIG_KUNIT=y
 CONFIG_KUNIT_DEBUGFS=y
-CONFIG_TEST_STACKINIT=m
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 9cac3225313b..348385db498c 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -617,4 +617,3 @@ CONFIG_HIST_TRIGGERS=y
 CONFIG_UNWINDER_FRAME_POINTER=y
 CONFIG_KUNIT=y
 CONFIG_KUNIT_DEBUGFS=y
-CONFIG_TEST_STACKINIT=m