diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index d4e3932d46..b0615212cf 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -82,11 +82,16 @@
     - .component_ut_template
     - .rules:tests:unit_test_32
 
-.component_ut_s2_template: # unused yet
+.component_ut_s2_template:
   extends:
     - .component_ut_template
     - .rules:tests:unit_test_s2
 
+.component_ut_c3_template:
+  extends:
+    - .component_ut_template
+    - .rules:tests:unit_test_c3
+
 .unit_test_template:
   extends:
     - .target_test_job_template
@@ -365,6 +370,18 @@ component_ut_test_001:
     - ESP32
     - COMPONENT_UT_GENERIC
 
+component_ut_test_s2_generic:
+  extends: .component_ut_s2_template
+  tags:
+    - ESP32S2
+    - COMPONENT_UT_GENERIC
+
+component_ut_test_c3_generic:
+  extends: .component_ut_c3_template
+  tags:
+    - ESP32C3
+    - COMPONENT_UT_GENERIC
+
 UT_001:
   extends: .unit_test_32_template
   parallel: 50