diff --git a/cv32e40s/regress/cv32e40s_full.yaml b/cv32e40s/regress/cv32e40s_full.yaml
index 7f2bea6793..6b98f6161a 100644
--- a/cv32e40s/regress/cv32e40s_full.yaml
+++ b/cv32e40s/regress/cv32e40s_full.yaml
@@ -541,3 +541,20 @@ tests:
     dir: cv32e40s/sim/uvmt
     cmd: make test TEST=debug_test_0_triggers
 
+  wfe_test:
+    description: Short directed wfe test
+    builds: [ uvmt_cv32e40s_clic, uvmt_cv32e40s ]
+    dir: cv32e40s/sim/uvmt
+    cmd: make test TEST=wfe_test
+
+  xsecure_test:
+    description: xsecure test
+    builds: [ uvmt_cv32e40s_clic ]
+    dir: cv32e40s/sim/uvmt
+    cmd: make test TEST=xsecure_test
+
+  xsecure_csrs:
+    description: xsecure csr test
+    builds: [ uvmt_cv32e40s_clic, uvmt_cv32e40s ]
+    dir: cv32e40s/sim/uvmt
+    cmd: make test TEST=xsecure_csrs
diff --git a/cv32e40s/tests/cfg/clic_default.yaml b/cv32e40s/tests/cfg/clic_default.yaml
index 403bad9a57..a1906d591e 100644
--- a/cv32e40s/tests/cfg/clic_default.yaml
+++ b/cv32e40s/tests/cfg/clic_default.yaml
@@ -5,6 +5,7 @@ compile_flags:
     +define+CLIC_EN
     +define+PMP_ENABLE_64
 ovpsim: >
+    --override cpu/hpmcounter_undefined=T
     --override cpu/CLICLEVELS=256
     --override cpu/CLICXCSW=T
     --override cpu/CLICXNXTI=T