diff --git a/app/debug_overlay.conf b/app/debug_overlay.conf
index 86cc10c745fe..60da9d2ecf7f 100644
--- a/app/debug_overlay.conf
+++ b/app/debug_overlay.conf
@@ -1,8 +1,9 @@
 CONFIG_DEBUG=y
 CONFIG_ASSERT=y
 
-CONFIG_ZTEST=y
-CONFIG_SOF_BOOT_TEST=y
+# Disabled until DSP panic #8621 is fixed
+# CONFIG_ZTEST=y
+# CONFIG_SOF_BOOT_TEST=y
 
 # Following options can be enabled additionally,
 # but will incur a higher runtime cost, so are thus