diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index d5e1e31a877..34d3adadcd3 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -1821,6 +1821,21 @@
     - <<: *if-dev-push
       changes: *patterns-component_ut-i154
 
+.rules:test:component_ut-esp32c6-wifi:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected
+    - <<: *if-label-build-only
+      when: never
+    - <<: *if-label-component_ut
+    - <<: *if-label-component_ut_esp32c6
+    - <<: *if-label-target_test
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-wifi
+    - <<: *if-dev-push
+      changes: *patterns-target_test-wifi
+
 .rules:test:component_ut-esp32h2:
   rules:
     - <<: *if-revert-branch
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index c9ead77b3a3..5a451b49f23 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -1153,6 +1153,15 @@ pytest_components_esp32s3_two_duts:
       artifacts: false
   tags: [ esp32s3, two_duts ]
 
+pytest_components_esp32c6_two_duts:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32c6-wifi
+  needs:
+    - job: build_pytest_components_esp32c6
+      artifacts: false
+  tags: [ esp32c6, two_duts ]
+
 pytest_components_esp32c2_two_duts:
   extends:
     - .pytest_components_dir_template
diff --git a/components/esp_wifi/test_apps/.build-test-rules.yml b/components/esp_wifi/test_apps/.build-test-rules.yml
index 50782379c6b..d402bdbfc00 100644
--- a/components/esp_wifi/test_apps/.build-test-rules.yml
+++ b/components/esp_wifi/test_apps/.build-test-rules.yml
@@ -4,7 +4,7 @@ components/esp_wifi/test_apps/wifi_connect:
   disable:
     - if: SOC_WIFI_SUPPORTED != 1
   disable_test:
-    - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3", "esp32c2"]
+    - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3", "esp32c2", "esp32c6"]
       reason: leak of runner
 
 components/esp_wifi/test_apps/wifi_function:
diff --git a/components/esp_wifi/test_apps/wifi_connect/pytest_wifi_connect.py b/components/esp_wifi/test_apps/wifi_connect/pytest_wifi_connect.py
index 43c9331a839..91de74029e5 100644
--- a/components/esp_wifi/test_apps/wifi_connect/pytest_wifi_connect.py
+++ b/components/esp_wifi/test_apps/wifi_connect/pytest_wifi_connect.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 import pytest
 from pytest_embedded_idf.unity_tester import CaseTester
@@ -7,8 +7,16 @@ from pytest_embedded_idf.unity_tester import CaseTester
 @pytest.mark.esp32
 @pytest.mark.esp32c3
 @pytest.mark.esp32s3
+@pytest.mark.esp32c6
 @pytest.mark.two_duts
-@pytest.mark.parametrize('count', [2], indirect=True)
+@pytest.mark.parametrize(
+    'count, config',
+    [
+        (2, 'default'),
+        (2, 'static_tx_buf'),
+    ],
+    indirect=True,
+)
 def test_wifi_connect_cases(case_tester: CaseTester) -> None:  # type: ignore
     case_tester.run_all_cases()
 
@@ -20,6 +28,7 @@ def test_wifi_connect_cases(case_tester: CaseTester) -> None:  # type: ignore
     'count, config, baud',
     [
         (2, 'esp32c2_xtal26m', '74880'),
+        (2, 'esp32c2_xtal26m_static_tx_buf', '74880'),
     ],
     indirect=True,
 )
diff --git a/components/esp_wifi/test_apps/wifi_connect/sdkconfig.ci.esp32c2_xtal26m_static_tx_buf b/components/esp_wifi/test_apps/wifi_connect/sdkconfig.ci.esp32c2_xtal26m_static_tx_buf
new file mode 100644
index 00000000000..33a0e96fb07
--- /dev/null
+++ b/components/esp_wifi/test_apps/wifi_connect/sdkconfig.ci.esp32c2_xtal26m_static_tx_buf
@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32c2"
+CONFIG_XTAL_FREQ_26=y
+CONFIG_ESP_WIFI_STATIC_TX_BUFFER=y
diff --git a/components/esp_wifi/test_apps/wifi_connect/sdkconfig.ci.static_tx_buf b/components/esp_wifi/test_apps/wifi_connect/sdkconfig.ci.static_tx_buf
new file mode 100644
index 00000000000..bec99dd7477
--- /dev/null
+++ b/components/esp_wifi/test_apps/wifi_connect/sdkconfig.ci.static_tx_buf
@@ -0,0 +1 @@
+CONFIG_ESP_WIFI_STATIC_TX_BUFFER=y