diff --git a/samples/sid_end_device/sample.yaml b/samples/sid_end_device/sample.yaml
index c09f5e852..a5fc40231 100644
--- a/samples/sid_end_device/sample.yaml
+++ b/samples/sid_end_device/sample.yaml
@@ -17,14 +17,14 @@ common:
     - nrf54l15dk/nrf54l15/cpuapp/ns
     - nrf54l15dk/nrf54l10/cpuapp
 tests:
-  sidewalk.samples.sid_end_device.hello:
+  sample.sidewalk.hello:
     extra_configs:
       - CONFIG_SID_END_DEVICE_PERSISTENT_LINK_MASK=y
       - CONFIG_SIDEWALK_FILE_TRANSFER=y
       - CONFIG_SIDEWALK_APPLICATION_NAME="hello"
     tags: Sidewalk hello
 
-  sidewalk.samples.sid_end_device.hello.release:
+  sample.sidewalk.hello.release:
     extra_args:
       FILE_SUFFIX=release
     extra_configs:
@@ -32,13 +32,13 @@ tests:
       - CONFIG_SIDEWALK_APPLICATION_NAME="hello.release"
     tags: Sidewalk hello
 
-  sidewalk.samples.sid_end_device.hello.ble_only:
+  sample.sidewalk.hello.ble_only:
     extra_configs:
       - CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n
       - CONFIG_SIDEWALK_APPLICATION_NAME="hello.ble_only"
     tags: Sidewalk hello BLE
 
-  sidewalk.samples.sid_end_device.hello.ble_only.release:
+  sample.sidewalk.hello.ble_only.release:
     extra_args:
       FILE_SUFFIX=release
     extra_configs:
@@ -46,7 +46,7 @@ tests:
       - CONFIG_SIDEWALK_APPLICATION_NAME="hello.ble_only.release"
     tags: Sidewalk hello BLE
 
-  sidewalk.samples.sid_end_device.demo:
+  sample.sidewalk.demo:
     extra_args:
       OVERLAY_CONFIG="overlay-demo.conf"
     extra_configs:
@@ -54,7 +54,7 @@ tests:
       - CONFIG_SIDEWALK_APPLICATION_NAME="demo"
     tags: Sidewalk demo
 
-  sidewalk.samples.sid_end_device.demo.ble_only:
+  sample.sidewalk.demo.ble_only:
     platform_allow:
       - thingy53/nrf5340/cpuapp
     extra_args:
@@ -66,14 +66,14 @@ tests:
       - thingy53/nrf5340/cpuapp
     tags: Sidewalk demo BLE
 
-  sidewalk.samples.sid_end_device.dut:
+  sample.sidewalk.dut:
     extra_args:
       OVERLAY_CONFIG="overlay-dut.conf"
     extra_configs:
       - CONFIG_SIDEWALK_APPLICATION_NAME="dut"
     tags: Sidewalk cli
 
-  sidewalk.samples.sid_end_device.dut.ble_only:
+  sample.sidewalk.dut.ble_only:
     extra_args:
       OVERLAY_CONFIG="overlay-dut.conf"
     extra_configs:
@@ -81,7 +81,7 @@ tests:
       - CONFIG_SIDEWALK_APPLICATION_NAME="dut.ble_only"
     tags: Sidewalk cli BLE
 
-  sidewalk.samples.sid_end_device.dut.no_secure:
+  sample.sidewalk.dut.no_secure:
     extra_args:
       OVERLAY_CONFIG="overlay-dut.conf"
     extra_configs:
diff --git a/test_config.yaml b/test_config.yaml
index 43356fa98..55589a289 100644
--- a/test_config.yaml
+++ b/test_config.yaml
@@ -7,8 +7,8 @@ levels:
     description: >
       Prepare samples.
     adds:
-      - sidewalk.samples.*
-      - sidewalk.test.acceptance.simple_bootloader
+      - sample.sidewalk.*
+      - sidewalk.test.simple_bootloader
 
   - name: unit
     description: >
diff --git a/tests/manual/simple_bootloader/sample.yaml b/tests/manual/simple_bootloader/sample.yaml
index 471a2c0ed..f6443c67d 100644
--- a/tests/manual/simple_bootloader/sample.yaml
+++ b/tests/manual/simple_bootloader/sample.yaml
@@ -2,7 +2,7 @@ sample:
   name: simple bootloader app
   description: Small footprint application to verify sidewalk dfu
 tests:
-  sidewalk.test.acceptance.simple_bootloader:
+  sidewalk.test.simple_bootloader:
     sysbuild: true
     build_only: true
     platform_allow: