diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 84d3b9f57594b..0000000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- * Copyright (c) 2025 Ezurio LLC
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/comparator/nrf-comp.h>
-
-&comp {
-	main-mode = "SE";
-	psel = <NRF_COMP_AIN4>; /* P1.11 */
-	refsel = "INT_1V2";
-	sp-mode = "HIGH";
-	th-up = <63>;
-	th-down = <59>;
-	isource = "DISABLED";
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index 84d3b9f57594b..0000000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- * Copyright (c) 2025 Ezurio LLC
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/comparator/nrf-comp.h>
-
-&comp {
-	main-mode = "SE";
-	psel = <NRF_COMP_AIN4>; /* P1.11 */
-	refsel = "INT_1V2";
-	sp-mode = "HIGH";
-	th-up = <63>;
-	th-down = <59>;
-	isource = "DISABLED";
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml
deleted file mode 100644
index 9d876bfded03f..0000000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-name: gpio_loopback_nrf_comp
-
-boards:
-  nrf5340dk/nrf5340/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf5340dk_nrf5340_cpuapp.overlay
-  nrf54h20dk/nrf54h20/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay
-  nrf54l15dk/nrf54l15/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
-  nrf54lm20dk/nrf54lm20a/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay
-  ophelia4ev/nrf54l15/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index e208b85b2ae94..0000000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- * Copyright (c) 2025 Ezurio LLC
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/comparator/nrf-comp.h>
-
-&comp {
-	compatible = "nordic,nrf-lpcomp";
-	psel = <NRF_COMP_AIN4>; /* P1.11 */
-	refsel = "VDD_4_8";
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay
deleted file mode 100644
index e208b85b2ae94..0000000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor
- * Copyright (c) 2025 Ezurio LLC
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/comparator/nrf-comp.h>
-
-&comp {
-	compatible = "nordic,nrf-lpcomp";
-	psel = <NRF_COMP_AIN4>; /* P1.11 */
-	refsel = "VDD_4_8";
-	status = "okay";
-};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml
deleted file mode 100644
index c2a2005af4d3c..0000000000000
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-name: gpio_loopback_nrf_lpcomp
-
-boards:
-  nrf5340dk/nrf5340/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf5340dk_nrf5340_cpuapp.overlay
-  nrf54h20dk/nrf54h20/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay
-  nrf54l15dk/nrf54l15/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
-  nrf54lm20dk/nrf54lm20a/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay
-  ophelia4ev/nrf54l15/cpuapp:
-    append:
-      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/socs/nrf5340_cpuapp_nrf_comp.overlay
similarity index 100%
rename from tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay
rename to tests/drivers/comparator/gpio_loopback/socs/nrf5340_cpuapp_nrf_comp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/socs/nrf5340_cpuapp_nrf_lpcomp.overlay
similarity index 100%
rename from tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay
rename to tests/drivers/comparator/gpio_loopback/socs/nrf5340_cpuapp_nrf_lpcomp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/socs/nrf54h20_cpuapp_nrf_comp.overlay
similarity index 100%
rename from tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
rename to tests/drivers/comparator/gpio_loopback/socs/nrf54h20_cpuapp_nrf_comp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/socs/nrf54h20_cpuapp_nrf_lpcomp.overlay
similarity index 100%
rename from tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
rename to tests/drivers/comparator/gpio_loopback/socs/nrf54h20_cpuapp_nrf_lpcomp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/socs/nrf54l15_cpuapp_nrf_comp.overlay
similarity index 100%
rename from tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/comparator/gpio_loopback/socs/nrf54l15_cpuapp_nrf_comp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/socs/nrf54l15_cpuapp_nrf_lpcomp.overlay
similarity index 100%
rename from tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
rename to tests/drivers/comparator/gpio_loopback/socs/nrf54l15_cpuapp_nrf_lpcomp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/socs/nrf54lm20a_cpuapp_nrf_comp.overlay
similarity index 100%
rename from tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay
rename to tests/drivers/comparator/gpio_loopback/socs/nrf54lm20a_cpuapp_nrf_comp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/socs/nrf54lm20a_cpuapp_nrf_lpcomp.overlay
similarity index 100%
rename from tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay
rename to tests/drivers/comparator/gpio_loopback/socs/nrf54lm20a_cpuapp_nrf_lpcomp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/testcase.yaml b/tests/drivers/comparator/gpio_loopback/testcase.yaml
index acec903991b18..7aed8ca5118c3 100644
--- a/tests/drivers/comparator/gpio_loopback/testcase.yaml
+++ b/tests/drivers/comparator/gpio_loopback/testcase.yaml
@@ -19,8 +19,7 @@ tests:
       - frdm_ke15z
   drivers.comparator.gpio_loopback.nrf_comp:
     extra_args:
-      - SNIPPET_ROOT="."
-      - SNIPPET="gpio_loopback_nrf_comp"
+      - FILE_SUFFIX="nrf_comp"
     platform_allow:
       - nrf5340dk/nrf5340/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
@@ -29,8 +28,7 @@ tests:
       - ophelia4ev/nrf54l15/cpuapp
   drivers.comparator.gpio_loopback.nrf_lpcomp:
     extra_args:
-      - SNIPPET_ROOT="."
-      - SNIPPET="gpio_loopback_nrf_lpcomp"
+      - FILE_SUFFIX="nrf_lpcomp"
     platform_allow:
       - nrf5340dk/nrf5340/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp