diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index f751e40ee7..3f311315c0 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -442,11 +442,12 @@ UT_031:
   extends: .unit_test_template
   parallel: 28
   tags:
-    - 7.2.2
+    - ESP32S2BETA_IDF
     - UT_T1_1
 
 UT_032:
   extends: .unit_test_template
+  parallel: 4
   tags:
     - ESP32_IDF
     - UT_T1_FlashEncryption
diff --git a/tools/unit-test-app/tools/ConfigDependency.yml b/tools/unit-test-app/tools/ConfigDependency.yml
index c9b2d46903..e998cd28a9 100644
--- a/tools/unit-test-app/tools/ConfigDependency.yml
+++ b/tools/unit-test-app/tools/ConfigDependency.yml
@@ -1,4 +1,4 @@
 "psram": '{CONFIG_ESP32_SPIRAM_SUPPORT=y} and not {CONFIG_SPIRAM_BANKSWITCH_ENABLE=y}'
 "8Mpsram": "CONFIG_SPIRAM_BANKSWITCH_ENABLE=y"
 "ESP32_IDF": "CONFIG_IDF_TARGET_ESP32=y"
-"7.2.2": "CONFIG_IDF_TARGET_ESP32S2BETA=y"
\ No newline at end of file
+"ESP32S2BETA_IDF": "CONFIG_IDF_TARGET_ESP32S2BETA=y"
\ No newline at end of file
diff --git a/tools/unit-test-app/tools/UnitTestParser.py b/tools/unit-test-app/tools/UnitTestParser.py
index 574df3e0a8..eff151f11d 100644
--- a/tools/unit-test-app/tools/UnitTestParser.py
+++ b/tools/unit-test-app/tools/UnitTestParser.py
@@ -103,7 +103,7 @@ class Parser(object):
                 file_name = table.get_string("any", file_name_addr)
 
                 # Search in tags to set the target
-                target_tag_dict = {"ESP32_IDF": "esp32", "7.2.2": "esp32s2beta"}
+                target_tag_dict = {"ESP32_IDF": "esp32", "ESP32S2BETA_IDF": "esp32s2beta"}
                 for tag in target_tag_dict:
                     if tag in tags:
                         target = target_tag_dict[tag]