diff --git a/components/driver/.build-test-rules.yml b/components/driver/.build-test-rules.yml
index 087232e8c2..5e2ef3004a 100644
--- a/components/driver/.build-test-rules.yml
+++ b/components/driver/.build-test-rules.yml
@@ -19,10 +19,7 @@ components/driver/test_apps/i2s_test_apps:
 components/driver/test_apps/i2s_test_apps/i2s:
   disable:
     - if: SOC_I2S_SUPPORTED != 1
-  disable_test:
-    - if: IDF_TARGET in ["esp32h2"]
-      temporary: true
-      reason: Cannot pass test, see IDF-6811
+
 components/driver/test_apps/i2s_test_apps/i2s_tdm:
   disable:
     - if: SOC_I2S_SUPPORTS_TDM != 1
@@ -34,10 +31,6 @@ components/driver/test_apps/i2s_test_apps/legacy_i2s_adc_dac:
 components/driver/test_apps/i2s_test_apps/legacy_i2s_driver:
   disable:
     - if: SOC_I2S_SUPPORTED != 1
-  disable_test:
-    - if: IDF_TARGET in ["esp32h2"]
-      temporary: true
-      reason: cannot pass test IDF-6811
 
 components/driver/test_apps/ledc:
   disable:
diff --git a/components/driver/test_apps/i2s_test_apps/i2s/main/test_i2s.c b/components/driver/test_apps/i2s_test_apps/i2s/main/test_i2s.c
index b8aaa01570..03b86f898f 100644
--- a/components/driver/test_apps/i2s_test_apps/i2s/main/test_i2s.c
+++ b/components/driver/test_apps/i2s_test_apps/i2s/main/test_i2s.c
@@ -749,11 +749,15 @@ static void i2s_test_common_sample_rate(i2s_chan_handle_t rx_chan, i2s_std_clk_c
     /* Test common sample rate
      * Workaround: set 12000 as 12001 to bypass the unknown failure, TODO: IDF-6705 */
     const uint32_t test_freq[] = {
-        8000,  10000, 11025, 12001, 16000, 22050,
+        8000,  10001, 11025, 12001, 16000, 22050,
         24000, 32000, 44100, 48000, 64000, 88200,
         96000, 128000,144000,196000};
     int real_pulse = 0;
     int case_cnt = sizeof(test_freq) / sizeof(uint32_t);
+#if SOC_I2S_SUPPORTS_PLL_F96M
+    // 196000 Hz sample rate doesn't support on PLL_96M target
+    case_cnt = 15;
+#endif
 #if SOC_I2S_SUPPORTS_XTAL
     // Can't support a very high sample rate while using XTAL as clock source
     if (clk_cfg->clk_src == I2S_CLK_SRC_XTAL) {
diff --git a/components/driver/test_apps/i2s_test_apps/i2s/pytest_i2s.py b/components/driver/test_apps/i2s_test_apps/i2s/pytest_i2s.py
index 78fbdb8a80..8920052d55 100644
--- a/components/driver/test_apps/i2s_test_apps/i2s/pytest_i2s.py
+++ b/components/driver/test_apps/i2s_test_apps/i2s/pytest_i2s.py
@@ -10,7 +10,7 @@ from pytest_embedded import Dut
 @pytest.mark.esp32c3
 @pytest.mark.esp32c6
 @pytest.mark.esp32s3
-# @pytest.mark.esp32h2  IDF-6811
+@pytest.mark.esp32h2
 @pytest.mark.generic
 @pytest.mark.parametrize(
     'config',
diff --git a/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/main/test_legacy_i2s.c b/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/main/test_legacy_i2s.c
index c6f8ea9e9f..54436d2385 100644
--- a/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/main/test_legacy_i2s.c
+++ b/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/main/test_legacy_i2s.c
@@ -888,6 +888,11 @@ static void i2s_test_common_sample_rate(i2s_port_t id)
     int case_cnt = sizeof(test_freq) / sizeof(uint32_t);
 #endif
 
+#if SOC_I2S_SUPPORTS_PLL_F96M
+    // 196000 Hz sample rate doesn't support on PLL_96M target
+    case_cnt = 15;
+#endif
+
     // Acquire the PM lock incase Dynamic Frequency Scaling(DFS) lower the frequency
 #ifdef CONFIG_PM_ENABLE
     esp_pm_lock_handle_t pm_lock;
diff --git a/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/pytest_legacy_i2s.py b/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/pytest_legacy_i2s.py
index de433a2214..0efdd44a40 100644
--- a/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/pytest_legacy_i2s.py
+++ b/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/pytest_legacy_i2s.py
@@ -10,7 +10,7 @@ from pytest_embedded import Dut
 @pytest.mark.esp32c3
 @pytest.mark.esp32s3
 @pytest.mark.esp32c6
-# @pytest.mark.esp32h2  IDF-6811
+@pytest.mark.esp32h2
 @pytest.mark.generic
 @pytest.mark.parametrize(
     'config',
diff --git a/examples/peripherals/.build-test-rules.yml b/examples/peripherals/.build-test-rules.yml
index e981a13a71..c54e7df104 100644
--- a/examples/peripherals/.build-test-rules.yml
+++ b/examples/peripherals/.build-test-rules.yml
@@ -57,10 +57,6 @@ examples/peripherals/i2s/i2s_codec/i2s_es7210_tdm:
   disable:
     - if: SOC_I2S_SUPPORTS_TDM != 1 or (SOC_I2C_SUPPORTED != 1 or SOC_GPSPI_SUPPORTED != 1)
       reason: rely on I2S TDM mode to receive audio, I2C to config es7210 and SPI to save audio to SD card
-  disable_test:
-    - if: IDF_TARGET in ["esp32h2"]
-      temporary: true
-      reason: cannot pass target test IDF-6811
 
 examples/peripherals/i2s/i2s_codec/i2s_es8311:
   disable:
diff --git a/examples/peripherals/i2s/i2s_codec/i2s_es7210_tdm/pytest_i2s_es7210_tdm.py b/examples/peripherals/i2s/i2s_codec/i2s_es7210_tdm/pytest_i2s_es7210_tdm.py
index 33f7b29901..618c700bfd 100644
--- a/examples/peripherals/i2s/i2s_codec/i2s_es7210_tdm/pytest_i2s_es7210_tdm.py
+++ b/examples/peripherals/i2s/i2s_codec/i2s_es7210_tdm/pytest_i2s_es7210_tdm.py
@@ -7,7 +7,7 @@ from pytest_embedded import Dut
 @pytest.mark.esp32s3
 @pytest.mark.esp32c3
 @pytest.mark.esp32c6
-# @pytest.mark.esp32h2   IDF-6264
+@pytest.mark.esp32h2
 @pytest.mark.generic
 def test_i2s_es7210_tdm_example(dut: Dut) -> None:
     dut.expect_exact('example: Create I2S receive channel')