diff --git a/payloads/libpayload/arch/mock/Kconfig b/payloads/libpayload/arch/mock/Kconfig
index 030f310337..81794ea74b 100644
--- a/payloads/libpayload/arch/mock/Kconfig
+++ b/payloads/libpayload/arch/mock/Kconfig
@@ -3,6 +3,7 @@
 config ARCH_MOCK
 	select LITTLE_ENDIAN if !ARCH_MOCK_BIG_ENDIAN
 	select BIG_ENDIAN if ARCH_MOCK_BIG_ENDIAN
+	select ARCH_HAS_NDELAY
 
 if ARCH_MOCK
 
diff --git a/payloads/libpayload/tests/drivers/Makefile.mk b/payloads/libpayload/tests/drivers/Makefile.mk
index f898278a3a..087043dcd6 100644
--- a/payloads/libpayload/tests/drivers/Makefile.mk
+++ b/payloads/libpayload/tests/drivers/Makefile.mk
@@ -8,4 +8,3 @@ graphics-test-srcs += libc/fpmath.c
 speaker-test-srcs += tests/drivers/speaker-test.c
 speaker-test-mocks += inb
 speaker-test-mocks += outb
-speaker-test-mocks += ndelay