diff --git a/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp b/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp
index d64652d56a..195c5476d5 100644
--- a/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp
+++ b/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp
@@ -54,9 +54,8 @@ struct MasterFixture {
     vector<uint8_t> data;
 };
 
-#if SOC_I2C_SUPPORT_SALVE
 // TODO The I2C driver tests are disabled, so disable them here, too. Probably due to no runners.
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP8684)
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C2)
 
 static void i2c_slave_read_raw_byte(void)
 {
@@ -259,5 +258,4 @@ TEST_CASE_MULTIPLE_DEVICES("I2CMaster Composed transfer", "[cxx i2c][test_env=UT
         i2c_master_composed_trans, i2c_slave_composed_trans);
 
 #endif  //TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3)
-#endif // SOC_I2C_SUPPORT_SALVE
 #endif // __cpp_exceptions
diff --git a/examples/peripherals/i2c/i2c_tools/main/cmd_i2ctools.c b/examples/peripherals/i2c/i2c_tools/main/cmd_i2ctools.c
index 551128228d..28b97b2180 100644
--- a/examples/peripherals/i2c/i2c_tools/main/cmd_i2ctools.c
+++ b/examples/peripherals/i2c/i2c_tools/main/cmd_i2ctools.c
@@ -31,7 +31,7 @@ static const char *TAG = "cmd_i2ctools";
 #if CONFIG_IDF_TARGET_ESP32S3
 static gpio_num_t i2c_gpio_sda = 1;
 static gpio_num_t i2c_gpio_scl = 2;
-#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684
+#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2
 static gpio_num_t i2c_gpio_sda = 5;
 static gpio_num_t i2c_gpio_scl = 6;
 #else