diff --git a/sys/arm64/include/param.h b/sys/arm64/include/param.h
index 645a2150778e..b1847defba17 100644
--- a/sys/arm64/include/param.h
+++ b/sys/arm64/include/param.h
@@ -113,10 +113,10 @@
 #define	MAXPAGESIZES	3		/* maximum number of supported page sizes */
 
 #ifndef KSTACK_PAGES
-#ifdef __CHERI_PURE_CAPABILITY__
+#if defined(KCOV) || defined(COVERAGE) || defined(KASAN) || defined(KMSAN)
+#define KSTACK_PAGES    6
+#elif defined(__CHERI_PURE_CAPABILITY__)
 #define	KSTACK_PAGES	5	/* pages of kernel stack (with pcb) */
-#elif defined(KASAN) || defined(KMSAN)
-#define	KSTACK_PAGES	6
 #else
 #define	KSTACK_PAGES	4	/* pages of kernel stack (with pcb) */
 #endif