diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 52c80a58ce..503ed640f6 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -79,14 +79,6 @@ example_test_pytest_esp32c2_generic:
     - build_pytest_examples_esp32c2
   tags: [ esp32c2, generic, xtal_40mhz ]
 
-example_test_pytest_esp32c2_26mhz:
-  extends:
-    - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32c2
-  needs:
-    - build_pytest_examples_esp32c2
-  tags: [ esp32c2, xtal_26mhz ]
-
 example_test_pytest_esp32c3_generic:
   extends:
     - .pytest_examples_dir_template
@@ -362,7 +354,7 @@ component_ut_pytest_esp32c2_adc:
     - .rules:test:component_ut-esp32c2-adc
   needs:
     - build_pytest_components_esp32c2
-  tags: [ esp32c2, adc ]
+  tags: [ esp32c2, adc, xtal_26mhz ]
 
 component_ut_pytest_esp32c2_xtal_26mhz:
   extends:
@@ -370,7 +362,7 @@ component_ut_pytest_esp32c2_xtal_26mhz:
     - .rules:test:component_ut-esp32c2
   needs:
     - build_pytest_components_esp32c2
-  tags: [ esp32c2, xtal_26mhz ]
+  tags: [ esp32c2, generic, xtal_26mhz ]
 
 component_ut_pytest_esp32c3_generic:
   extends:
@@ -445,14 +437,6 @@ test_app_test_pytest_esp32c2_generic:
     - build_pytest_test_apps_esp32c2
   tags: [ esp32c2, generic, xtal_40mhz ]
 
-test_app_test_pytest_esp32c2_26mhz:
-  extends:
-    - .pytest_test_apps_dir_template
-    - .rules:test:custom_test-esp32c2
-  needs:
-    - build_pytest_test_apps_esp32c2
-  tags: [ esp32c2, xtal_26mhz ]
-
 test_app_test_pytest_esp32c3_generic:
   extends:
     - .pytest_test_apps_dir_template
diff --git a/components/driver/test_apps/gptimer/pytest_gptimer.py b/components/driver/test_apps/gptimer/pytest_gptimer.py
index 9ee6a734fd..05d8f9639a 100644
--- a/components/driver/test_apps/gptimer/pytest_gptimer.py
+++ b/components/driver/test_apps/gptimer/pytest_gptimer.py
@@ -22,6 +22,7 @@ def test_gptimer(dut: Dut) -> None:
 
 
 @pytest.mark.esp32c2
+@pytest.mark.generic
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'config, baud',
diff --git a/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py b/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py
index 667555b36d..00789424d6 100644
--- a/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py
+++ b/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py
@@ -23,9 +23,9 @@ def test_legacy_adc(dut: Dut) -> None:
     dut.expect_unity_test_output(timeout=240)
 
 
-# All ESP32C2 ADC runners are 26m xtal
 @pytest.mark.esp32c2
 @pytest.mark.adc
+@pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'config, baud',
     [
diff --git a/components/esp_adc/test_apps/adc/pytest_adc.py b/components/esp_adc/test_apps/adc/pytest_adc.py
index e9b3d0fb0f..54158685ca 100644
--- a/components/esp_adc/test_apps/adc/pytest_adc.py
+++ b/components/esp_adc/test_apps/adc/pytest_adc.py
@@ -25,6 +25,7 @@ def test_adc(dut: Dut) -> None:
 # No PM test, as C2 doesn't support ADC continuous mode
 @pytest.mark.esp32c2
 @pytest.mark.adc
+@pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'config, baud',
     [