diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 4ecd4323de..c7530dcf34 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -714,6 +714,14 @@ pytest_components_esp32s3_octal_psram:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, octal_psram ]
 
+pytest_components_esp32s3_quad_psram:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32s3
+  needs:
+    - build_pytest_components_esp32s3
+  tags: [ esp32s3, quad_psram ]
+
 pytest_components_esp32s3_flash_encryption_f4r8:
   extends:
     - .pytest_components_dir_template
@@ -1254,13 +1262,6 @@ UT_028:
     - UT_T2_1
     - psram
 
-UT_033:
-  extends: .unit_test_esp32_template
-  tags:
-    - ESP32_IDF
-    - UT_T2_Ethernet
-    - psram
-
 UT_035:
   extends: .unit_test_esp32s2_template
   parallel: 16
@@ -1320,15 +1321,6 @@ UT_S3:
     - ESP32S3_IDF
     - UT_T1_1
 
-
-UT_S3_QUAD_PSRAM:
-  extends: .unit_test_esp32s3_template
-  parallel: 2
-  tags:
-    - ESP32S3_IDF
-    - UT_T1_1
-    - quad_psram
-
 .integration_test_template:
   extends:
     - .target_test_job_template