diff --git a/sw/device/tests/BUILD b/sw/device/tests/BUILD
index baa7a0a..6316d7d 100644
--- a/sw/device/tests/BUILD
+++ b/sw/device/tests/BUILD
@@ -821,7 +821,7 @@
 
 matcha_dv_test(
     name = "alert_test",
-    srcs = ["autogen/alert_test.c"],
+    srcs = ["autogen/matcha/alert_test.c"],
     deps = [
         ":test_dv_lib",
         "//sw/device/lib/dif:alert_handler",
@@ -879,7 +879,7 @@
 
 matcha_dv_test(
     name = "plic_all_irqs_test",
-    srcs = ["autogen/plic_all_irqs_test.c"],
+    srcs = ["autogen/matcha/plic_all_irqs_test.c"],
     deps = [
         ":test_dv_lib",
         "//sw/device/lib/dif:alert_handler",
diff --git a/sw/device/tests/autogen/alert_test.c b/sw/device/tests/autogen/matcha/alert_test.c
similarity index 100%
rename from sw/device/tests/autogen/alert_test.c
rename to sw/device/tests/autogen/matcha/alert_test.c
diff --git a/sw/device/tests/autogen/plic_all_irqs_test.c b/sw/device/tests/autogen/matcha/plic_all_irqs_test.c
similarity index 100%
rename from sw/device/tests/autogen/plic_all_irqs_test.c
rename to sw/device/tests/autogen/matcha/plic_all_irqs_test.c
diff --git a/util/topgen_matcha.py b/util/topgen_matcha.py
index 1ca2581..9f7ee44 100755
--- a/util/topgen_matcha.py
+++ b/util/topgen_matcha.py
@@ -1501,7 +1501,7 @@
                                          out_path=os.path.relpath(out_path,
                                                                   SRCTREE_TOP))
         for fname in ["alert_test.c", "plic_all_irqs_test.c"]:
-            outfile = SRCTREE_TOP / "sw/device/tests/autogen" / fname
+            outfile = SRCTREE_TOP / f"sw/device/tests/autogen/{topname}" / fname
             render_template(TOPGEN_TEMPLATE_MATCHA_PATH / f"{fname}.tpl",
                             outfile,
                             helper=c_helper,