diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/disco_l475_iot1.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/disco_l475_iot1.overlay
new file mode 100644
index 00000000000..89f1920465a
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/disco_l475_iot1.overlay
@@ -0,0 +1,7 @@
+&wwdg {
+	status = "okay";
+};
+
+&iwdg {
+	status = "disabled";
+};
diff --git a/tests/drivers/watchdog/wdt_basic_api/nucleo_l496zg.conf b/tests/drivers/watchdog/wdt_basic_api/nucleo_l496zg.conf
deleted file mode 100644
index cacad7364ce..00000000000
--- a/tests/drivers/watchdog/wdt_basic_api/nucleo_l496zg.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# 2MHz system clock
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=2000000
-
-# SYSCLK selection
-CONFIG_CLOCK_STM32_SYSCLK_SRC_MSI=y
-# produce 2MHz clock at MSI RC output
-CONFIG_CLOCK_STM32_MSI_RANGE=5
-# select buses prescalers
-CONFIG_CLOCK_STM32_AHB_PRESCALER=1
-CONFIG_CLOCK_STM32_APB1_PRESCALER=1
-CONFIG_CLOCK_STM32_APB2_PRESCALER=1
diff --git a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
index 8530bb3698b..3134a5c1f33 100644
--- a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
@@ -2,13 +2,14 @@ tests:
   drivers.watchdog:
     depends_on: watchdog
     tags: drivers watchdog
-    filter: not CONFIG_WDT_SAM
-    platform_exclude: nucleo_l496zg nucleo_f401re mec15xxevb_assy6853
-  drivers.watchdog.nucleo_l496zg:
+    filter: not (CONFIG_WDT_SAM or dt_compat_enabled("st,stm32-window-watchdog"))
+    platform_exclude: mec15xxevb_assy6853
+  drivers.watchdog.stm32wwdg:
     depends_on: watchdog
     tags: drivers watchdog
-    extra_args: CONF_FILE="prj.conf;nucleo_l496zg.conf"
-    platform_allow: nucleo_l496zg
+    filter: dt_compat_enabled("st,stm32-window-watchdog")
+    extra_configs:
+      - CONFIG_CLOCK_STM32_APB1_PRESCALER=16
   drivers.watchdog.mec15xxevb_assy6853:
     depends_on: watchdog
     tags: drivers watchdog