diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 35652b3c95..2aa2650e6e 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -621,6 +621,14 @@ component_ut_pytest_esp32c6_generic:
     - build_pytest_components_esp32c6
   tags: [ esp32c6, generic ]
 
+component_ut_pytest_esp32c6_generic_multi_device:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32c6
+  needs:
+    - build_pytest_components_esp32c6
+  tags: [ esp32c6, generic_multi_device ]
+
 component_ut_pytest_esp32h4_i154:
   extends:
     - .pytest_components_dir_template
diff --git a/components/driver/test_apps/spi/master/pytest_spi_master.py b/components/driver/test_apps/spi/master/pytest_spi_master.py
index da1b32824b..0fe54d0e14 100644
--- a/components/driver/test_apps/spi/master/pytest_spi_master.py
+++ b/components/driver/test_apps/spi/master/pytest_spi_master.py
@@ -28,7 +28,6 @@ def test_master_esp_flash(case_tester) -> None:        # type: ignore
 
 # if `test_env` not defined, will run on `generic_multi_device` by default
 @pytest.mark.supported_targets
-@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='no runner')
 @pytest.mark.generic_multi_device
 @pytest.mark.parametrize('count, config', [(2, 'defaults',), (2, 'release',), (2, 'freertos_compliance',), (2, 'freertos_flash',)], indirect=True)
 def test_master_multi_dev(case_tester) -> None:        # type: ignore
diff --git a/components/driver/test_apps/spi/slave/pytest_spi_slave.py b/components/driver/test_apps/spi/slave/pytest_spi_slave.py
index 55c6aac98c..9341a2d793 100644
--- a/components/driver/test_apps/spi/slave/pytest_spi_slave.py
+++ b/components/driver/test_apps/spi/slave/pytest_spi_slave.py
@@ -16,7 +16,6 @@ def test_slave_single_dev(case_tester) -> None:       # type: ignore
 
 # if `test_env` not defined, will run on `generic_multi_device` by default
 @pytest.mark.supported_targets
-@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='no runner')
 @pytest.mark.generic_multi_device
 @pytest.mark.parametrize('count', [2,], indirect=True)
 def test_slave_multi_dev(case_tester) -> None:        # type: ignore
diff --git a/components/driver/test_apps/spi/slave_hd/pytest_spi_slave_hd.py b/components/driver/test_apps/spi/slave_hd/pytest_spi_slave_hd.py
index 644cab166b..59ca8d72e0 100644
--- a/components/driver/test_apps/spi/slave_hd/pytest_spi_slave_hd.py
+++ b/components/driver/test_apps/spi/slave_hd/pytest_spi_slave_hd.py
@@ -16,7 +16,6 @@ def test_slave_hd_single_dev(case_tester) -> None:       # type: ignore
 
 # if `test_env` not defined, will run on `generic_multi_device` by default
 @pytest.mark.supported_targets
-@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='no runner')
 @pytest.mark.generic_multi_device
 @pytest.mark.parametrize('count', [2,], indirect=True)
 def test_slave_hd_multi_dev(case_tester) -> None:        # type: ignore