diff --git a/tests/benchmarks/multicore/idle/CMakeLists.txt b/tests/benchmarks/multicore/idle/CMakeLists.txt
index 2b80b145ce7a..9d54a11e5d3d 100644
--- a/tests/benchmarks/multicore/idle/CMakeLists.txt
+++ b/tests/benchmarks/multicore/idle/CMakeLists.txt
@@ -7,8 +7,9 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-if (NOT SYSBUILD)
-	message(WARNING
+
+if(NOT SYSBUILD)
+	message(FATAL_ERROR
 		" This is a multi-image application that should be built using sysbuild.\n"
 		" Add --sysbuild argument to west build command to prepare all the images.")
 endif()
diff --git a/tests/benchmarks/multicore/idle_gpio/CMakeLists.txt b/tests/benchmarks/multicore/idle_gpio/CMakeLists.txt
index 0b908cb8ae8f..b93dba64d2a6 100644
--- a/tests/benchmarks/multicore/idle_gpio/CMakeLists.txt
+++ b/tests/benchmarks/multicore/idle_gpio/CMakeLists.txt
@@ -7,8 +7,9 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-if (NOT SYSBUILD)
-	message(WARNING
+
+if(NOT SYSBUILD)
+	message(FATAL_ERROR
 		" This is a multi-image application that should be built using sysbuild.\n"
 		" Add --sysbuild argument to west build command to prepare all the images.")
 endif()
diff --git a/tests/benchmarks/multicore/idle_outside_of_main/CMakeLists.txt b/tests/benchmarks/multicore/idle_outside_of_main/CMakeLists.txt
index 9fc5bce31c40..b225296a5514 100644
--- a/tests/benchmarks/multicore/idle_outside_of_main/CMakeLists.txt
+++ b/tests/benchmarks/multicore/idle_outside_of_main/CMakeLists.txt
@@ -7,6 +7,7 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
 if(NOT SYSBUILD)
 	message(FATAL_ERROR
 		" This is a multi-image application that should be built using sysbuild.\n"
diff --git a/tests/benchmarks/multicore/idle_spim/CMakeLists.txt b/tests/benchmarks/multicore/idle_spim/CMakeLists.txt
index 2c5a47a64444..7e443682f8fd 100644
--- a/tests/benchmarks/multicore/idle_spim/CMakeLists.txt
+++ b/tests/benchmarks/multicore/idle_spim/CMakeLists.txt
@@ -7,6 +7,7 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
 if(NOT SYSBUILD)
 	message(FATAL_ERROR
 		" This is a multi-image application that should be built using sysbuild.\n"
diff --git a/tests/benchmarks/multicore/idle_spim/testcase.yaml b/tests/benchmarks/multicore/idle_spim/testcase.yaml
index 6ec83b414450..3adc7f384e2c 100644
--- a/tests/benchmarks/multicore/idle_spim/testcase.yaml
+++ b/tests/benchmarks/multicore/idle_spim/testcase.yaml
@@ -12,7 +12,6 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
       - SHIELD=pca63566
-      - FILE_SUFFIX=s2ram
       - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
     harness_config:
       fixture: ppk_power_measure
diff --git a/tests/benchmarks/multicore/idle_twim/CMakeLists.txt b/tests/benchmarks/multicore/idle_twim/CMakeLists.txt
index 016dcf300373..0816cff95b0c 100644
--- a/tests/benchmarks/multicore/idle_twim/CMakeLists.txt
+++ b/tests/benchmarks/multicore/idle_twim/CMakeLists.txt
@@ -7,6 +7,7 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
 if(NOT SYSBUILD)
 	message(FATAL_ERROR
 		" This is a multi-image application that should be built using sysbuild.\n"
diff --git a/tests/benchmarks/multicore/idle_twim/testcase.yaml b/tests/benchmarks/multicore/idle_twim/testcase.yaml
index aca1bc12dba6..a68fcd5ae7fa 100644
--- a/tests/benchmarks/multicore/idle_twim/testcase.yaml
+++ b/tests/benchmarks/multicore/idle_twim/testcase.yaml
@@ -12,7 +12,6 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
       - SHIELD=pca63566
-      - FILE_SUFFIX=s2ram
       - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
     harness_config:
       fixture: ppk_power_measure
diff --git a/tests/benchmarks/multicore/idle_uarte/CMakeLists.txt b/tests/benchmarks/multicore/idle_uarte/CMakeLists.txt
index 35caa16f1267..3940e075baa2 100644
--- a/tests/benchmarks/multicore/idle_uarte/CMakeLists.txt
+++ b/tests/benchmarks/multicore/idle_uarte/CMakeLists.txt
@@ -7,6 +7,7 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
 if(NOT SYSBUILD)
 	message(FATAL_ERROR
 		" This is a multi-image application that should be built using sysbuild.\n"
diff --git a/tests/benchmarks/multicore/idle_uarte/testcase.yaml b/tests/benchmarks/multicore/idle_uarte/testcase.yaml
index ca4cc7a0e71b..223775d47320 100644
--- a/tests/benchmarks/multicore/idle_uarte/testcase.yaml
+++ b/tests/benchmarks/multicore/idle_uarte/testcase.yaml
@@ -11,7 +11,6 @@ tests:
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
-      - FILE_SUFFIX=s2ram
       - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
     harness_config:
       fixture: ppk_power_measure
diff --git a/tests/benchmarks/multicore/idle_with_pwm/src/main.c b/tests/benchmarks/multicore/idle_with_pwm/src/main.c
index b3cec7e323c9..3db01d4fda3a 100644
--- a/tests/benchmarks/multicore/idle_with_pwm/src/main.c
+++ b/tests/benchmarks/multicore/idle_with_pwm/src/main.c
@@ -89,7 +89,7 @@ int main(void)
 			return ret;
 		}
 
-		/* Sleep 1 second */
+		/* Sleep / enter low power state */
 		k_msleep(CONFIG_TEST_SLEEP_DURATION_MS);
 	}