diff --git a/samples/drivers/jesd216/boards/b_l4s5i_iot01a.conf b/samples/drivers/jesd216/boards/b_l4s5i_iot01a.conf
deleted file mode 100644
index 6e3cf258b12549..00000000000000
--- a/samples/drivers/jesd216/boards/b_l4s5i_iot01a.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2022 STMicroelectronics
-#
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_FLASH_STM32_OSPI=y
-CONFIG_SPI_NOR_SFDP_RUNTIME=y
-CONFIG_SPI_NOR=n
diff --git a/samples/drivers/jesd216/boards/b_u585i_iot02a.conf b/samples/drivers/jesd216/boards/b_u585i_iot02a.conf
deleted file mode 100644
index 6e3cf258b12549..00000000000000
--- a/samples/drivers/jesd216/boards/b_u585i_iot02a.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2022 STMicroelectronics
-#
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_FLASH_STM32_OSPI=y
-CONFIG_SPI_NOR_SFDP_RUNTIME=y
-CONFIG_SPI_NOR=n
diff --git a/samples/drivers/jesd216/boards/disco_l475_iot1.conf b/samples/drivers/jesd216/boards/disco_l475_iot1.conf
deleted file mode 100644
index dbb7255d188a7f..00000000000000
--- a/samples/drivers/jesd216/boards/disco_l475_iot1.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_FLASH_STM32_QSPI=y
-CONFIG_SPI_NOR_SFDP_RUNTIME=y
-CONFIG_SPI_NOR=n
diff --git a/samples/drivers/jesd216/boards/stm32h573i_dk.conf b/samples/drivers/jesd216/boards/stm32h573i_dk.conf
deleted file mode 100644
index 4dd3e9965c4244..00000000000000
--- a/samples/drivers/jesd216/boards/stm32h573i_dk.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2023 STMicroelectronics
-#
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_FLASH_STM32_OSPI=y
-CONFIG_SPI_NOR_SFDP_RUNTIME=y
-CONFIG_SPI_NOR=n
diff --git a/samples/drivers/jesd216/boards/stm32h735g_disco.conf b/samples/drivers/jesd216/boards/stm32h735g_disco.conf
deleted file mode 100644
index 6e3cf258b12549..00000000000000
--- a/samples/drivers/jesd216/boards/stm32h735g_disco.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2022 STMicroelectronics
-#
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_FLASH_STM32_OSPI=y
-CONFIG_SPI_NOR_SFDP_RUNTIME=y
-CONFIG_SPI_NOR=n
diff --git a/samples/drivers/jesd216/boards/stm32h747i_disco_m7.conf b/samples/drivers/jesd216/boards/stm32h747i_disco_m7.conf
deleted file mode 100644
index dbb7255d188a7f..00000000000000
--- a/samples/drivers/jesd216/boards/stm32h747i_disco_m7.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_FLASH_STM32_QSPI=y
-CONFIG_SPI_NOR_SFDP_RUNTIME=y
-CONFIG_SPI_NOR=n
diff --git a/samples/drivers/jesd216/boards/stm32l496g_disco.conf b/samples/drivers/jesd216/boards/stm32l496g_disco.conf
deleted file mode 100644
index dbb7255d188a7f..00000000000000
--- a/samples/drivers/jesd216/boards/stm32l496g_disco.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_FLASH_STM32_QSPI=y
-CONFIG_SPI_NOR_SFDP_RUNTIME=y
-CONFIG_SPI_NOR=n
diff --git a/samples/drivers/jesd216/boards/stm32l562e_dk.conf b/samples/drivers/jesd216/boards/stm32l562e_dk.conf
deleted file mode 100644
index 6e3cf258b12549..00000000000000
--- a/samples/drivers/jesd216/boards/stm32l562e_dk.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2022 STMicroelectronics
-#
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_FLASH_STM32_OSPI=y
-CONFIG_SPI_NOR_SFDP_RUNTIME=y
-CONFIG_SPI_NOR=n
diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index af84cbc791e80d..c50ce41d0f3183 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -28,3 +28,6 @@ tests:
     platform_allow: nrf52840dk_nrf52840
     integration_platforms:
       - nrf52840dk_nrf52840
+  sample.drivers.stm32.jesd216:
+    filter: dt_compat_enabled("st,stm32-ospi-nor") or dt_compat_enabled("st,stm32-qspi-nor")
+    depends_on: spi