diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index cf145e0fcd..3ea869be3b 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -630,7 +630,6 @@ example_test_001B_V3:
 
 example_test_001C:
   extends: .example_test_esp32_template
-  parallel: 2
   tags:
     - ESP32
     - Example_GENERIC
@@ -740,7 +739,6 @@ example_test_017:
 
 example_test_C3_GENERIC:
   extends: .example_test_esp32c3_template
-  parallel: 2
   tags:
     - ESP32C3
     - Example_GENERIC
@@ -817,43 +815,6 @@ test_app_test_eth:
     - ESP32
     - ethernet_router
 
-test_app_test_004:
-  extends: .test_app_esp32s2_template
-  tags:
-    - ESP32S2
-    - Example_GENERIC
-
-test_app_test_esp32c2_generic:
-  extends: .test_app_esp32c2_template
-  tags:
-    - ESP32C2
-    - Example_GENERIC
-    - xtal_40mhz
-
-test_app_test_esp32c2_26mhz:
-  extends: .test_app_esp32c2_template
-  tags:
-    - ESP32C2
-    - xtal_26mhz
-
-test_app_test_005:
-  extends: .test_app_esp32c3_template
-  tags:
-    - ESP32C3
-    - Example_GENERIC
-
-test_app_test_006:
-  extends: .test_app_esp32s3_template
-  tags:
-    - ESP32S3
-    - Example_GENERIC
-
-test_app_test_esp32_generic:
-  extends: .test_app_esp32_template
-  tags:
-    - ESP32
-    - Example_GENERIC
-
 .unit_test_template:
   extends: .target_test_job_template
   needs: # the assign already needs all the build jobs
@@ -890,7 +851,7 @@ test_app_test_esp32_generic:
 
 UT_001:
   extends: .unit_test_esp32_template
-  parallel: 44
+  parallel: 42
   tags:
     - ESP32_IDF
     - UT_T1_1
@@ -899,7 +860,7 @@ UT_001:
 
 UT_002:
   extends: .unit_test_esp32_template
-  parallel: 16
+  parallel: 15
   tags:
     - ESP32_IDF
     - UT_T1_1
@@ -932,12 +893,6 @@ UT_006:
     - UT_T1_SPIMODE
     - psram
 
-UT_007:
-  extends: .unit_test_esp32_template
-  tags:
-    - ESP32_IDF
-    - UT_T1_1
-
 UT_014:
   extends: .unit_test_esp32_template
   tags:
@@ -995,7 +950,7 @@ UT_034:
 
 UT_035:
   extends: .unit_test_esp32s2_template
-  parallel: 44
+  parallel: 43
   tags:
     - ESP32S2_IDF
     - UT_T1_1
@@ -1044,19 +999,6 @@ UT_045:
     - UT_SDIO
     - psram
 
-UT_046:
-  extends: .unit_test_esp32_template
-  tags:
-    - ESP32_IDF
-    - UT_T1_GPIO
-
-UT_047:
-  extends: .unit_test_esp32s2_template
-  parallel: 6
-  tags:
-    - ESP32S2_IDF
-    - UT_T1_1
-
 UT_S2_SPI_DUAL:
   extends: .unit_test_esp32s2_template
   tags:
@@ -1128,7 +1070,7 @@ UT_C2_FLASH:
 
 UT_C3:
   extends: .unit_test_esp32c3_template
-  parallel: 27
+  parallel: 26
   tags:
     - ESP32C3_IDF
     - UT_T1_1
@@ -1165,14 +1107,14 @@ UT_C3_SDSPI:
 
 UT_S3:
   extends: .unit_test_esp32s3_template
-  parallel: 25
+  parallel: 24
   tags:
     - ESP32S3_IDF
     - UT_T1_1
 
 UT_S3_QUAD_PSRAM:
   extends: .unit_test_esp32s3_template
-  parallel: 2
+  parallel: 3
   tags:
     - ESP32S3_IDF
     - UT_T1_1