diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77fe76db0eb71c1479a85033bfc7e7c11d6e48e4..222a3eb3cb86a01227f8194c9e2c6e2ca429d363 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -334,182 +334,212 @@ generate-tests:
     LAVA_TEST_RTCWAKE: true
     FS_VARIANT: minimal
 
-lava-test-dmesg-genio-350:
-  extends:
-    - .lava-test
-    - .lava-test-dmesg
-    - .genio-350
-
-lava-test-dmesg-genio-510:
-  extends:
-    - .lava-test
-    - .lava-test-dmesg
-    - .genio-510
-
-lava-test-dmesg-genio-700:
-  extends:
-    - .lava-test
-    - .lava-test-dmesg
-    - .genio-700
-
-lava-test-dmesg-genio-1200:
-  extends:
-    - .lava-test
-    - .lava-test-dmesg
-    - .genio-1200
-
-lava-test-kselftest-dt-genio-350:
-  extends:
-    - .lava-test
-    - .lava-test-kselftest-dt
-    - .genio-350
-
-lava-test-kselftest-dt-genio-510:
-  extends:
-    - .lava-test
-    - .lava-test-kselftest-dt
-    - .genio-510
-
-lava-test-kselftest-dt-genio-700:
-  extends:
-    - .lava-test
-    - .lava-test-kselftest-dt
-    - .genio-700
-
-lava-test-kselftest-dt-genio-1200:
-  extends:
-    - .lava-test
-    - .lava-test-kselftest-dt
-    - .genio-1200
-
-lava-test-glmark2-genio-350:
-  extends:
-    - .lava-test
-    - .lava-test-glmark2
-    - .genio-350
-
-lava-test-glmark2-genio-510:
-  extends:
-    - .lava-test
-    - .lava-test-glmark2
-    - .genio-510
-
-lava-test-glmark2-genio-700:
-  extends:
-    - .lava-test
-    - .lava-test-glmark2
-    - .genio-700
-
-lava-test-glmark2-genio-1200:
-  extends:
-    - .lava-test
-    - .lava-test-glmark2
-    - .genio-1200
-
-# TODO: Enable once codecs work on Genio 350
-.lava-test-fluster-vp8-genio-350:
-  extends:
-    - .lava-test
-    - .lava-test-fluster-vp8
-    - .genio-350
-
-lava-test-fluster-vp8-genio-510:
-  extends:
-    - .lava-test
-    - .lava-test-fluster-vp8
-    - .genio-510
-
-lava-test-fluster-vp8-genio-700:
-  extends:
-    - .lava-test
-    - .lava-test-fluster-vp8
-    - .genio-700
-
-lava-test-fluster-vp8-genio-1200:
-  extends:
-    - .lava-test
-    - .lava-test-fluster-vp8
-    - .genio-1200
-
-lava-test-fluster-vp9-genio-700:
-  extends:
-    - .lava-test
-    - .lava-test-fluster-vp9
-    - .genio-700
-
-# TODO: Enable once h264 works on Genio 700
-.lava-test-fluster-h264-genio-700:
-  extends:
-    - .lava-test
-    - .lava-test-fluster-h264
-    - .genio-700
-
-lava-test-fluster-h264-genio-1200:
-  extends:
-    - .lava-test
-    - .lava-test-fluster-h264
-    - .genio-1200
-
-lava-test-fluster-h265-genio-700:
-  extends:
-    - .lava-test
-    - .lava-test-fluster-h265
-    - .genio-700
-
-lava-test-fluster-av1-genio-700:
-  extends:
-    - .lava-test
-    - .lava-test-fluster-av1
-    - .genio-700
-
-lava-test-avvideocompare-jpeg-genio-700:
-  extends:
-    - .lava-test
-    - .lava-test-avvideocompare-jpeg
-    - .genio-700
-
-lava-test-avvideocompare-mdp-genio-700:
-  extends:
-    - .lava-test
-    - .lava-test-avvideocompare-mdp
-    - .genio-700
+# lava-test-dmesg-genio-350:
+#   extends:
+#     - .lava-test
+#     - .lava-test-dmesg
+#     - .genio-350
+
+# lava-test-dmesg-genio-510:
+#   extends:
+#     - .lava-test
+#     - .lava-test-dmesg
+#     - .genio-510
+
+# lava-test-dmesg-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-dmesg
+#     - .genio-700
+
+# lava-test-dmesg-genio-1200:
+#   extends:
+#     - .lava-test
+#     - .lava-test-dmesg
+#     - .genio-1200
+
+# lava-test-kselftest-dt-genio-350:
+#   extends:
+#     - .lava-test
+#     - .lava-test-kselftest-dt
+#     - .genio-350
+
+# lava-test-kselftest-dt-genio-510:
+#   extends:
+#     - .lava-test
+#     - .lava-test-kselftest-dt
+#     - .genio-510
+
+# lava-test-kselftest-dt-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-kselftest-dt
+#     - .genio-700
+
+# lava-test-kselftest-dt-genio-1200:
+#   extends:
+#     - .lava-test
+#     - .lava-test-kselftest-dt
+#     - .genio-1200
+
+# lava-test-glmark2-genio-350:
+#   extends:
+#     - .lava-test
+#     - .lava-test-glmark2
+#     - .genio-350
+
+# lava-test-glmark2-genio-510:
+#   extends:
+#     - .lava-test
+#     - .lava-test-glmark2
+#     - .genio-510
+
+# lava-test-glmark2-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-glmark2
+#     - .genio-700
+
+# lava-test-glmark2-genio-1200:
+#   extends:
+#     - .lava-test
+#     - .lava-test-glmark2
+#     - .genio-1200
+
+# # TODO: Enable once codecs work on Genio 350
+# .lava-test-fluster-vp8-genio-350:
+#   extends:
+#     - .lava-test
+#     - .lava-test-fluster-vp8
+#     - .genio-350
+
+# lava-test-fluster-vp8-genio-510:
+#   extends:
+#     - .lava-test
+#     - .lava-test-fluster-vp8
+#     - .genio-510
+
+# lava-test-fluster-vp8-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-fluster-vp8
+#     - .genio-700
+
+# lava-test-fluster-vp8-genio-1200:
+#   extends:
+#     - .lava-test
+#     - .lava-test-fluster-vp8
+#     - .genio-1200
+
+# lava-test-fluster-vp9-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-fluster-vp9
+#     - .genio-700
+
+# # TODO: Enable once h264 works on Genio 700
+# .lava-test-fluster-h264-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-fluster-h264
+#     - .genio-700
+
+# lava-test-fluster-h264-genio-1200:
+#   extends:
+#     - .lava-test
+#     - .lava-test-fluster-h264
+#     - .genio-1200
+
+# lava-test-fluster-h265-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-fluster-h265
+#     - .genio-700
+
+# lava-test-fluster-av1-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-fluster-av1
+#     - .genio-700
+
+# lava-test-avvideocompare-jpeg-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-avvideocompare-jpeg
+#     - .genio-700
+
+# lava-test-avvideocompare-mdp-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-avvideocompare-mdp
+#     - .genio-700
+
+# lava-test-rtcwake-genio-350:
+#   extends:
+#     - .lava-test
+#     - .lava-test-rtcwake
+#     - .genio-350
+
+# # TODO: enable once fixed
+# .lava-test-rtcwake-genio-510:
+#   extends:
+#     - .lava-test
+#     - .lava-test-rtcwake
+#     - .genio-510
+
+# # TODO: enable once fixed
+# .lava-test-rtcwake-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-rtcwake
+#     - .genio-700
+
+# # TODO: enable once fixed
+# .lava-test-rtcwake-genio-1200:
+#   extends:
+#     - .lava-test
+#     - .lava-test-rtcwake
+#     - .genio-1200
+
+# # TODO: enable once fixed
+# .lava-test-wifi-genio-350:
+#   extends:
+#     - .lava-test
+#     - .lava-test-wifi
+#     - .genio-350
+
+# lava-test-wifi-genio-700:
+#   extends:
+#     - .lava-test
+#     - .lava-test-wifi
+#     - .genio-700
+
+.lava-test-watchdog:
+  variables:
+    LAVA_TEST: watchdog
+    LAVA_TEST_WATCHDOG: true
+    FS_VARIANT: minimal
 
-lava-test-rtcwake-genio-350:
+lava-test-watchdog-genio-350:
   extends:
     - .lava-test
-    - .lava-test-rtcwake
+    - .lava-test-watchdog
     - .genio-350
 
-# TODO: enable once fixed
-.lava-test-rtcwake-genio-510:
+lava-test-watchdog-genio-510:
   extends:
     - .lava-test
-    - .lava-test-rtcwake
+    - .lava-test-watchdog
     - .genio-510
 
-# TODO: enable once fixed
-.lava-test-rtcwake-genio-700:
+lava-test-watchdog-genio-700:
   extends:
     - .lava-test
-    - .lava-test-rtcwake
+    - .lava-test-watchdog
     - .genio-700
 
-# TODO: enable once fixed
-.lava-test-rtcwake-genio-1200:
+lava-test-watchdog-genio-1200:
   extends:
     - .lava-test
-    - .lava-test-rtcwake
+    - .lava-test-watchdog
     - .genio-1200
-
-# TODO: enable once fixed
-.lava-test-wifi-genio-350:
-  extends:
-    - .lava-test
-    - .lava-test-wifi
-    - .genio-350
-
-lava-test-wifi-genio-700:
-  extends:
-    - .lava-test
-    - .lava-test-wifi
-    - .genio-700
diff --git a/lava/testjob.yaml b/lava/testjob.yaml
index 332bf9ac879b8b7e346379517c0244beb99180d2..24dbb0f1b0fe17c282863dabec1e8de1f8964fad 100644
--- a/lava/testjob.yaml
+++ b/lava/testjob.yaml
@@ -52,6 +52,26 @@ actions:
         - 'user@debian-trixie(.*)$'
         - 'root@debian-trixie(.*)#'
 
+{{ #if job.LAVA_TEST_WATCHDOG }}
+  - test:
+      timeout:
+        minutes: 5
+      interactive:
+      - name: wdt-reset
+        prompts: ['root@debian-trixie(.*)#']
+        script:
+        - name: wdt-get-timeout
+          command: "wdt_timeout=$(cat /sys/class/watchdog/watchdog0/timeout)"
+          wait_for_prompt: true
+          failures:
+          - message: "cat: /sys/class/watchdog/watchdog\\d+/timeout: No such file or directory"
+            exception: JobError
+        - name: wdt-trigger-reset
+          command: "sleep $((wdt_timeout + 5)) > /dev/watchdog"
+          wait_for_prompt: false
+          successes:
+          - message: U-Boot
+{{ /if }}
 {{ #if job.LAVA_TEST_DMESG }}
   - test:
       definitions: