diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index ae09296711..d5d112b99d 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -902,6 +902,22 @@ UT_S3:
     - ESP32S3_IDF
     - UT_T1_1
 
+UT_S3_QUAD_PSRAM:
+  extends: .unit_test_esp32s3_template
+  parallel: 33
+  tags:
+    - ESP32S3_IDF
+    - UT_T1_1
+    - quad_psram
+
+UT_S3_OCTAL_PSRAM:
+  extends: .unit_test_esp32s3_template
+  parallel: 33
+  tags:
+    - ESP32S3_IDF
+    - UT_T1_1
+    - octal_psram
+
 UT_S3_SPI_DUAL:
   extends: .unit_test_esp32s3_template
   tags:
diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig
index 8358ef1835..9ccc22c7fd 100644
--- a/components/esp32/Kconfig
+++ b/components/esp32/Kconfig
@@ -26,6 +26,10 @@ menu "ESP32-specific"
     menu "SPI RAM config"
         depends on ESP32_SPIRAM_SUPPORT
 
+        config SPIRAM_MODE_QUAD
+            bool
+            default "y"
+
         choice SPIRAM_TYPE
             prompt "Type of SPI RAM chip in use"
             default SPIRAM_TYPE_AUTO
diff --git a/components/esp32s2/Kconfig b/components/esp32s2/Kconfig
index 73ff4afb39..6ce4246d7c 100644
--- a/components/esp32s2/Kconfig
+++ b/components/esp32s2/Kconfig
@@ -97,6 +97,10 @@ menu "ESP32S2-specific"
             bool
             default "y"
 
+        config SPIRAM_MODE_QUAD
+            bool
+            default "y"
+
         choice SPIRAM_TYPE
             prompt "Type of SPI RAM chip in use"
             default SPIRAM_TYPE_AUTO
diff --git a/tools/unit-test-app/tools/ConfigDependency.yml b/tools/unit-test-app/tools/ConfigDependency.yml
index 5a29de2952..fac208f905 100644
--- a/tools/unit-test-app/tools/ConfigDependency.yml
+++ b/tools/unit-test-app/tools/ConfigDependency.yml
@@ -4,3 +4,5 @@
 "ESP32S2_IDF": "CONFIG_IDF_TARGET_ESP32S2=y"
 "ESP32S3_IDF": "CONFIG_IDF_TARGET_ESP32S3=y"
 "ESP32C3_IDF": "CONFIG_IDF_TARGET_ESP32C3=y"
+"quad_psram": '{CONFIG_SPIRAM_MODE_QUAD=y} and {CONFIG_IDF_TARGET_ESP32S3=y}'
+"octal_psram": '{CONFIG_SPIRAM_MODE_OCT=y} and {CONFIG_IDF_TARGET_ESP32S3=y}'