diff --git a/hw/ip/pwrmgr/data/pwrmgr.hjson.tpl b/hw/ip/pwrmgr/data/pwrmgr.hjson.tpl
index 47c9f4a..30983c7 100644
--- a/hw/ip/pwrmgr/data/pwrmgr.hjson.tpl
+++ b/hw/ip/pwrmgr/data/pwrmgr.hjson.tpl
@@ -376,7 +376,7 @@
           ]
           tags: [// Turning off USB clock in active state impacts other CSRs
                  // at the chip level (in other blocks, such as clkmgr).
-                 "excl:CsrNonInitTests:CsrExclWrite"]
+                 "excl:CsrAllTests:CsrExclWrite"]
         },
 
         { bits: "8",
diff --git a/hw/top_earlgrey/ip/pwrmgr/data/autogen/pwrmgr.hjson b/hw/top_earlgrey/ip/pwrmgr/data/autogen/pwrmgr.hjson
index 0a974e9..070b1de 100644
--- a/hw/top_earlgrey/ip/pwrmgr/data/autogen/pwrmgr.hjson
+++ b/hw/top_earlgrey/ip/pwrmgr/data/autogen/pwrmgr.hjson
@@ -415,7 +415,7 @@
           ]
           tags: [// Turning off USB clock in active state impacts other CSRs
                  // at the chip level (in other blocks, such as clkmgr).
-                 "excl:CsrNonInitTests:CsrExclWrite"]
+                 "excl:CsrAllTests:CsrExclWrite"]
         },
 
         { bits: "8",