diff --git a/app/boards/intel_adsp_ace40_nvl.conf b/app/boards/intel_adsp_ace40_nvl.conf
index 896456e37f4d..6a986ddf3cbf 100644
--- a/app/boards/intel_adsp_ace40_nvl.conf
+++ b/app/boards/intel_adsp_ace40_nvl.conf
@@ -13,6 +13,7 @@ CONFIG_COMP_CHAIN_DMA=y
 CONFIG_COMP_DRC=y
 CONFIG_COMP_KPB=y
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
+CONFIG_COMP_TESTER=y
 CONFIG_COMP_UP_DOWN_MIXER=y
 CONFIG_COMP_VOLUME_WINDOWS_FADE=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
diff --git a/app/boards/intel_adsp_ace40_nvls.conf b/app/boards/intel_adsp_ace40_nvls.conf
index 896456e37f4d..6a986ddf3cbf 100644
--- a/app/boards/intel_adsp_ace40_nvls.conf
+++ b/app/boards/intel_adsp_ace40_nvls.conf
@@ -13,6 +13,7 @@ CONFIG_COMP_CHAIN_DMA=y
 CONFIG_COMP_DRC=y
 CONFIG_COMP_KPB=y
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
+CONFIG_COMP_TESTER=y
 CONFIG_COMP_UP_DOWN_MIXER=y
 CONFIG_COMP_VOLUME_WINDOWS_FADE=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py
index bfb63d53de5e..ae9e4267d64e 100755
--- a/scripts/xtensa-build-zephyr.py
+++ b/scripts/xtensa-build-zephyr.py
@@ -92,6 +92,18 @@ class PlatformConfig:
 # These cannot be built by everyone out of the box yet.
 # For instance: there's no open-source toolchain available for them yet.
 extra_platform_configs = {
+	"nvl" : PlatformConfig(
+		"intel", "intel_adsp/ace40/nvl",
+		f"RI-2022.10{xtensa_tools_version_postfix}",
+		"ace4px_HiFi5MMU_PIF_nlib",
+		ipc4 = True
+	),
+	"nvl-s" : PlatformConfig(
+		"intel", "intel_adsp/ace40/nvls",
+		f"RI-2022.10{xtensa_tools_version_postfix}",
+		"ace4px_HiFi5MMU_PIF_nlib",
+		ipc4 = True
+	),
 	"wcl-sim" : PlatformConfig(
 		"intel", "intel_adsp/ace30/wcl/sim",
 		f"RI-2022.10{xtensa_tools_version_postfix}",
@@ -180,18 +192,6 @@ class PlatformConfig:
 		"ace30_LX7HiFi4_PIF",
 		ipc4 = True
 	),
-	"nvl" : PlatformConfig(
-		"intel", "intel_adsp/ace40/nvl",
-		f"RI-2022.10{xtensa_tools_version_postfix}",
-		"ace4px_HiFi5MMU_PIF_nlib",
-		ipc4 = True
-	),
-	"nvl-s" : PlatformConfig(
-		"intel", "intel_adsp/ace40/nvls",
-		f"RI-2022.10{xtensa_tools_version_postfix}",
-		"ace4px_HiFi5MMU_PIF_nlib",
-		ipc4 = True
-	),
 
 	#  NXP platforms
 	"imx8" : PlatformConfig(
diff --git a/tools/rimage/config/lnl.toml.h b/tools/rimage/config/lnl.toml.h
index 6d1e0f0ef04a..f369df356274 100644
--- a/tools/rimage/config/lnl.toml.h
+++ b/tools/rimage/config/lnl.toml.h
@@ -38,6 +38,10 @@
 
 	index = __COUNTER__
 
+#if defined(CONFIG_COMP_TESTER) || defined(LLEXT_FORCE_ALL_MODULAR)
+#include <debug/tester/tester.toml>
+#endif
+
 #if defined(CONFIG_COMP_MIXIN_MIXOUT) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mixin_mixout/mixin_mixout.toml>
 #endif
diff --git a/tools/rimage/config/nvl.toml.h b/tools/rimage/config/nvl.toml.h
index a14029ff3fe5..31f8eaaa814c 100644
--- a/tools/rimage/config/nvl.toml.h
+++ b/tools/rimage/config/nvl.toml.h
@@ -24,6 +24,10 @@ auto_start = "0"
 
 index = __COUNTER__
 
+#if defined(CONFIG_COMP_TESTER)
+#include <debug/tester/tester.toml>
+#endif
+
 #ifdef CONFIG_COMP_MIXIN_MIXOUT
 #include <audio/mixin_mixout/mixin_mixout.toml>
 #endif
diff --git a/tools/rimage/config/ptl.toml.h b/tools/rimage/config/ptl.toml.h
index 2c39818fd19b..f8c134a62f26 100644
--- a/tools/rimage/config/ptl.toml.h
+++ b/tools/rimage/config/ptl.toml.h
@@ -38,6 +38,10 @@ auto_start = "0"
 
 index = __COUNTER__
 
+#if defined(CONFIG_COMP_TESTER) || defined(LLEXT_FORCE_ALL_MODULAR)
+#include <debug/tester/tester.toml>
+#endif
+
 #if defined(CONFIG_COMP_MIXIN_MIXOUT) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mixin_mixout/mixin_mixout.toml>
 #endif
diff --git a/tools/rimage/config/wcl.toml.h b/tools/rimage/config/wcl.toml.h
index 2c39818fd19b..f8c134a62f26 100644
--- a/tools/rimage/config/wcl.toml.h
+++ b/tools/rimage/config/wcl.toml.h
@@ -38,6 +38,10 @@ auto_start = "0"
 
 index = __COUNTER__
 
+#if defined(CONFIG_COMP_TESTER) || defined(LLEXT_FORCE_ALL_MODULAR)
+#include <debug/tester/tester.toml>
+#endif
+
 #if defined(CONFIG_COMP_MIXIN_MIXOUT) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mixin_mixout/mixin_mixout.toml>
 #endif