diff --git a/hw/top_matcha/dv/chip_sim_cfg.hjson b/hw/top_matcha/dv/chip_sim_cfg.hjson
index ed15271..ac9d937 100644
--- a/hw/top_matcha/dv/chip_sim_cfg.hjson
+++ b/hw/top_matcha/dv/chip_sim_cfg.hjson
@@ -1191,14 +1191,14 @@
     {
       name: chip_sw_aon_timer_irq
       uvm_test_seq: chip_sw_base_vseq
-      sw_images: ["//sw/device/tests:aon_timer_irq_test:1"]
+      sw_images: ["//sw/device/tests:aon_timer_irq_test:1:matcha"]
       en_run_modes: ["sw_test_mode_test_rom"]
       run_opts: ["+sw_test_timeout_ns=18_000_000"]
     }
     {
       name: chip_sw_aon_timer_sleep_wdog_sleep_pause
       uvm_test_seq: chip_sw_base_vseq
-      sw_images: ["//sw/device/tests:aon_timer_sleep_wdog_sleep_pause_test:1"]
+      sw_images: ["//sw/device/tests:aon_timer_sleep_wdog_sleep_pause_test:1:matcha"]
       en_run_modes: ["sw_test_mode_test_rom"]
       run_opts: ["+sw_test_timeout_ns=18_000_000"]
       reseed: 5
@@ -1206,7 +1206,7 @@
     {
       name: chip_sw_aon_timer_wdog_bite_reset
       uvm_test_seq: chip_sw_base_vseq
-      sw_images: ["//sw/device/tests:aon_timer_wdog_bite_reset_test:1"]
+      sw_images: ["//sw/device/tests:aon_timer_wdog_bite_reset_test:1:matcha"]
       en_run_modes: ["sw_test_mode_test_rom"]
       run_opts: ["+sw_test_timeout_ns=18_000_000"]
     }
@@ -2069,7 +2069,10 @@
         "chip_sw_alert_handler_escalation",
         "chip_sw_alert_handler_ping_timeout",
         "chip_sw_alert_test",
+        "chip_sw_aon_timer_irq",
+        "chip_sw_aon_timer_sleep_wdog_sleep_pause",
         "chip_sw_aon_timer_smoketest",
+        "chip_sw_aon_timer_wdog_bite_reset",
         "chip_sw_ast_clk_rst_inputs",
         "chip_sw_atomics_test",
         "chip_sw_cam_ctrl_test",
@@ -2166,7 +2169,10 @@
         "chip_sw_alert_handler_escalation",
         "chip_sw_alert_handler_ping_timeout",
         "chip_sw_alert_test",
+        "chip_sw_aon_timer_irq",
+        "chip_sw_aon_timer_sleep_wdog_sleep_pause",
         "chip_sw_aon_timer_smoketest",
+        "chip_sw_aon_timer_wdog_bite_reset",
         "chip_sw_ast_clk_rst_inputs",
         "chip_sw_atomics_test",
         "chip_sw_cam_ctrl_test",
diff --git a/sw/device/tests/BUILD b/sw/device/tests/BUILD
index 8217ae7..382af1e 100644
--- a/sw/device/tests/BUILD
+++ b/sw/device/tests/BUILD
@@ -1034,6 +1034,50 @@
     ],
 )
 
+matcha_dv_test(
+    name = "aon_timer_irq_test",
+    srcs = ["@lowrisc_opentitan//sw/device/tests:aon_timer_irq_test.c"],
+    deps = [
+        ":test_dv_lib_opentitan",
+        "//sw/device/lib/dif:rv_plic_sec",
+        "@lowrisc_opentitan//sw/device/lib/base:math",
+        "@lowrisc_opentitan//sw/device/lib/dif:aon_timer",
+        "@lowrisc_opentitan//sw/device/lib/dif:rv_timer",
+        "@lowrisc_opentitan//sw/device/lib/testing:aon_timer_testutils",
+        "@lowrisc_opentitan//sw/device/lib/testing:rand_testutils",
+        "@lowrisc_opentitan//sw/device/lib/testing:rv_plic_testutils",
+    ],
+)
+
+matcha_dv_test(
+    name = "aon_timer_wdog_bite_reset_test",
+    srcs = ["@lowrisc_opentitan//sw/device/tests:aon_timer_wdog_bite_reset_test.c"],
+    deps = [
+        ":test_dv_lib_opentitan",
+        "//sw/device/lib/dif:rstmgr",
+        "@lowrisc_opentitan//sw/device/lib/base:math",
+        "@lowrisc_opentitan//sw/device/lib/dif:aon_timer",
+        "@lowrisc_opentitan//sw/device/lib/dif:pwrmgr",
+        "@lowrisc_opentitan//sw/device/lib/testing:aon_timer_testutils",
+        "@lowrisc_opentitan//sw/device/lib/testing:pwrmgr_testutils",
+        "@lowrisc_opentitan//sw/device/lib/testing:rstmgr_testutils",
+    ],
+)
+
+matcha_dv_test(
+    name = "aon_timer_sleep_wdog_sleep_pause_test",
+    srcs = ["@lowrisc_opentitan//sw/device/tests:aon_timer_sleep_wdog_sleep_pause_test.c"],
+    deps = [
+        ":test_dv_lib_opentitan",
+        "//sw/device/lib/dif:rstmgr",
+        "@lowrisc_opentitan//sw/device/lib/dif:aon_timer",
+        "@lowrisc_opentitan//sw/device/lib/dif:pwrmgr",
+        "@lowrisc_opentitan//sw/device/lib/testing:aon_timer_testutils",
+        "@lowrisc_opentitan//sw/device/lib/testing:pwrmgr_testutils",
+        "@lowrisc_opentitan//sw/device/lib/testing:rstmgr_testutils",
+    ],
+)
+
 # Smoke tests
 matcha_dv_test(
     name = "aes_smoketest",