diff --git a/.idf_build_apps.toml b/.idf_build_apps.toml
index 3c562a0..d6e0756 100644
--- a/.idf_build_apps.toml
+++ b/.idf_build_apps.toml
@@ -1,18 +1,12 @@
 # See https://docs.espressif.com/projects/idf-build-apps/en/latest/references/config_file.html
 
 config_rules = [
-    "sdkconfig.ci.wifi=wifi",
-    "sdkconfig.ci.ethernet=ethernet",
-    "sdkconfig.ci.tcp=tcp",
-    "sdkconfig.ci.ascii=ascii",
-    "sdkconfig.ci.rtu=rtu",
-    "sdkconfig.ci.serial=serial",
-    "sdkconfig.ci.generic=generic",
-    "sdkconfig.defaults=default",
+    "sdkconfig.ci.*=",
+    "!sdkconfig.ci.defaults",
     "=default",
 ]
 
-sdkconfig_defaults = "sdkconfig.defaults"
+sdkconfig_defaults = "sdkconfig.defaults;sdkconfig.ci.defaults"
 
 recursive = true
 check_warnings = true
diff --git a/examples/serial/mb_serial_master/sdkconfig.ci.ascii b/examples/serial/mb_serial_master/sdkconfig.ci.ascii
index cb7845c..4aaf606 100644
--- a/examples/serial/mb_serial_master/sdkconfig.ci.ascii
+++ b/examples/serial/mb_serial_master/sdkconfig.ci.ascii
@@ -1,11 +1,5 @@
+#
+# ASCII-specific configuration
+#
 CONFIG_MB_COMM_MODE_ASCII=y
 CONFIG_MB_COMM_MODE_RTU=n
-CONFIG_MB_UART_BAUD_RATE=115200
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=400
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_FMB_EXT_TYPE_SUPPORT=y
-CONFIG_HEAP_POISONING_COMPREHENSIVE=y
-CONFIG_HEAP_TRACING_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/examples/serial/mb_serial_master/sdkconfig.ci.defaults b/examples/serial/mb_serial_master/sdkconfig.ci.defaults
new file mode 100644
index 0000000..9e61789
--- /dev/null
+++ b/examples/serial/mb_serial_master/sdkconfig.ci.defaults
@@ -0,0 +1,10 @@
+#
+# Common options for mb_serial_master CI configs
+#
+CONFIG_MB_UART_BAUD_RATE=115200
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=400
+CONFIG_FMB_EXT_TYPE_SUPPORT=y
+CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
+CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/examples/serial/mb_serial_master/sdkconfig.ci.rtu b/examples/serial/mb_serial_master/sdkconfig.ci.rtu
index 0fed5b9..f61431b 100644
--- a/examples/serial/mb_serial_master/sdkconfig.ci.rtu
+++ b/examples/serial/mb_serial_master/sdkconfig.ci.rtu
@@ -1,11 +1,5 @@
+#
+# RTU-specific configuration
+#
 CONFIG_MB_COMM_MODE_ASCII=n
 CONFIG_MB_COMM_MODE_RTU=y
-CONFIG_MB_UART_BAUD_RATE=115200
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=400
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_FMB_EXT_TYPE_SUPPORT=y
-CONFIG_HEAP_POISONING_COMPREHENSIVE=y
-CONFIG_HEAP_TRACING_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/examples/serial/mb_serial_master/sdkconfig.defaults b/examples/serial/mb_serial_master/sdkconfig.defaults
index 0fed5b9..308f1ca 100644
--- a/examples/serial/mb_serial_master/sdkconfig.defaults
+++ b/examples/serial/mb_serial_master/sdkconfig.defaults
@@ -1,11 +1,12 @@
+#
+# Default configuration options
+#
 CONFIG_MB_COMM_MODE_ASCII=n
 CONFIG_MB_COMM_MODE_RTU=y
 CONFIG_MB_UART_BAUD_RATE=115200
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=400
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
 CONFIG_FMB_EXT_TYPE_SUPPORT=y
-CONFIG_HEAP_POISONING_COMPREHENSIVE=y
-CONFIG_HEAP_TRACING_OFF=y
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
 CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/examples/serial/mb_serial_slave/sdkconfig.ci.ascii b/examples/serial/mb_serial_slave/sdkconfig.ci.ascii
index 114b366..4aaf606 100644
--- a/examples/serial/mb_serial_slave/sdkconfig.ci.ascii
+++ b/examples/serial/mb_serial_slave/sdkconfig.ci.ascii
@@ -1,10 +1,5 @@
+#
+# ASCII-specific configuration
+#
 CONFIG_MB_COMM_MODE_ASCII=y
 CONFIG_MB_COMM_MODE_RTU=n
-CONFIG_MB_SLAVE_ADDR=1
-CONFIG_MB_UART_BAUD_RATE=115200
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_FMB_EXT_TYPE_SUPPORT=y
-CONFIG_HEAP_POISONING_COMPREHENSIVE=y
-CONFIG_HEAP_TRACING_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/examples/serial/mb_serial_slave/sdkconfig.ci.defaults b/examples/serial/mb_serial_slave/sdkconfig.ci.defaults
new file mode 100644
index 0000000..7b08fae
--- /dev/null
+++ b/examples/serial/mb_serial_slave/sdkconfig.ci.defaults
@@ -0,0 +1,12 @@
+#
+# Common options for mb_serial_slave CI configs
+#
+CONFIG_MB_SLAVE_ADDR=1
+CONFIG_MB_UART_BAUD_RATE=115200
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=400
+CONFIG_FMB_EXT_TYPE_SUPPORT=y
+
+CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
+CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/examples/serial/mb_serial_slave/sdkconfig.ci.rtu b/examples/serial/mb_serial_slave/sdkconfig.ci.rtu
index ed6f25a..f61431b 100644
--- a/examples/serial/mb_serial_slave/sdkconfig.ci.rtu
+++ b/examples/serial/mb_serial_slave/sdkconfig.ci.rtu
@@ -1,10 +1,5 @@
+#
+# RTU-specific configuration
+#
 CONFIG_MB_COMM_MODE_ASCII=n
 CONFIG_MB_COMM_MODE_RTU=y
-CONFIG_MB_SLAVE_ADDR=1
-CONFIG_MB_UART_BAUD_RATE=115200
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_FMB_EXT_TYPE_SUPPORT=y
-CONFIG_HEAP_POISONING_COMPREHENSIVE=y
-CONFIG_HEAP_TRACING_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/examples/serial/mb_serial_slave/sdkconfig.defaults b/examples/serial/mb_serial_slave/sdkconfig.defaults
index 316fb9b..3c51dbd 100644
--- a/examples/serial/mb_serial_slave/sdkconfig.defaults
+++ b/examples/serial/mb_serial_slave/sdkconfig.defaults
@@ -1,13 +1,14 @@
 #
-# Modbus configuration
+# Default configuration options
 #
 CONFIG_MB_COMM_MODE_ASCII=n
 CONFIG_MB_COMM_MODE_RTU=y
 CONFIG_MB_SLAVE_ADDR=1
 CONFIG_MB_UART_BAUD_RATE=115200
 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=400
 CONFIG_FMB_EXT_TYPE_SUPPORT=y
-CONFIG_HEAP_POISONING_COMPREHENSIVE=y
-CONFIG_HEAP_TRACING_OFF=y
+
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
 CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/examples/tcp/mb_tcp_master/sdkconfig.ci.defaults b/examples/tcp/mb_tcp_master/sdkconfig.ci.defaults
new file mode 100644
index 0000000..85c78dd
--- /dev/null
+++ b/examples/tcp/mb_tcp_master/sdkconfig.ci.defaults
@@ -0,0 +1,20 @@
+#
+# Common options for mb_tcp_master CI configs
+#
+CONFIG_FMB_COMM_MODE_RTU_EN=n
+CONFIG_FMB_COMM_MODE_ASCII_EN=n
+CONFIG_FMB_COMM_MODE_TCP_EN=y
+CONFIG_FMB_TCP_PORT_DEFAULT=1502
+CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
+CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
+CONFIG_FMB_PORT_TASK_PRIO=10
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_EXT_TYPE_SUPPORT=y
+CONFIG_FMB_TCP_UID_ENABLED=n
+CONFIG_EXAMPLE_CONNECT_IPV6=n
+CONFIG_MB_SLAVE_IP_FROM_STDIN=y
+CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
+CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+CONFIG_MB_CONSOLE_HELPER_ENABLED=y
diff --git a/examples/tcp/mb_tcp_master/sdkconfig.ci.ethernet b/examples/tcp/mb_tcp_master/sdkconfig.ci.ethernet
index cfd0dcb..9c0db72 100644
--- a/examples/tcp/mb_tcp_master/sdkconfig.ci.ethernet
+++ b/examples/tcp/mb_tcp_master/sdkconfig.ci.ethernet
@@ -1,20 +1,6 @@
 #
-# Modbus configuration
+# Ethernet-specific configuration
 #
-CONFIG_FMB_COMM_MODE_TCP_EN=y
-CONFIG_FMB_TCP_PORT_DEFAULT=1502
-CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=n
-CONFIG_FMB_COMM_MODE_ASCII_EN=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TCP_UID_ENABLED=y
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_MB_SLAVE_IP_FROM_STDIN=y
-CONFIG_FMB_EXT_TYPE_SUPPORT=y
-
 CONFIG_EXAMPLE_CONNECT_IPV6=n
 CONFIG_EXAMPLE_CONNECT_WIFI=n
 CONFIG_EXAMPLE_CONNECT_ETHERNET=y
@@ -30,7 +16,4 @@ CONFIG_ETH_ENABLED=y
 CONFIG_ETH_USE_ESP32_EMAC=y
 CONFIG_ETH_USE_SPI_ETHERNET=n
 
-CONFIG_HEAP_POISONING_COMPREHENSIVE=y
-CONFIG_HEAP_TRACING_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+CONFIG_FMB_MDNS_INTEGRATION_ENABLE=n
diff --git a/examples/tcp/mb_tcp_master/sdkconfig.ci.wifi b/examples/tcp/mb_tcp_master/sdkconfig.ci.wifi
index 65a5294..84c55b2 100644
--- a/examples/tcp/mb_tcp_master/sdkconfig.ci.wifi
+++ b/examples/tcp/mb_tcp_master/sdkconfig.ci.wifi
@@ -1,24 +1,10 @@
-CONFIG_FMB_COMM_MODE_TCP_EN=y
-CONFIG_FMB_TCP_PORT_DEFAULT=1502
-CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=n
-CONFIG_FMB_COMM_MODE_ASCII_EN=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TCP_UID_ENABLED=y
-CONFIG_MB_SLAVE_IP_FROM_STDIN=y
+#
+# WiFi-specific configuration
+#
 CONFIG_EXAMPLE_CONNECT_IPV6=n
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_FMB_EXT_TYPE_SUPPORT=y
-
 CONFIG_EXAMPLE_CONNECT_ETHERNET=n
 CONFIG_EXAMPLE_CONNECT_WIFI=y
 CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}"
 CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}"
 
-CONFIG_HEAP_POISONING_COMPREHENSIVE=y
-CONFIG_HEAP_TRACING_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+CONFIG_FMB_MDNS_INTEGRATION_ENABLE=n
diff --git a/examples/tcp/mb_tcp_master/sdkconfig.defaults b/examples/tcp/mb_tcp_master/sdkconfig.defaults
index 5eacb0c..0862c8e 100644
--- a/examples/tcp/mb_tcp_master/sdkconfig.defaults
+++ b/examples/tcp/mb_tcp_master/sdkconfig.defaults
@@ -1,20 +1,20 @@
 #
-# Modbus configuration
+# Default configuration options
 #
+CONFIG_FMB_COMM_MODE_RTU_EN=n
+CONFIG_FMB_COMM_MODE_ASCII_EN=n
 CONFIG_FMB_COMM_MODE_TCP_EN=y
 CONFIG_FMB_TCP_PORT_DEFAULT=1502
 CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
 CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
 CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=n
-CONFIG_FMB_COMM_MODE_ASCII_EN=n
 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_FMB_TCP_UID_ENABLED=y
-CONFIG_MB_SLAVE_IP_FROM_STDIN=n
 CONFIG_FMB_EXT_TYPE_SUPPORT=y
+CONFIG_FMB_TCP_UID_ENABLED=n
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
 CONFIG_EXAMPLE_CONNECT_IPV6=n
+CONFIG_MB_SLAVE_IP_FROM_STDIN=y
 CONFIG_EXAMPLE_CONNECT_ETHERNET=n
 CONFIG_EXAMPLE_CONNECT_WIFI=y
 CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}"
diff --git a/examples/tcp/mb_tcp_slave/sdkconfig.ci.defaults b/examples/tcp/mb_tcp_slave/sdkconfig.ci.defaults
new file mode 100644
index 0000000..55b7a32
--- /dev/null
+++ b/examples/tcp/mb_tcp_slave/sdkconfig.ci.defaults
@@ -0,0 +1,20 @@
+#
+# Common options for mb_tcp_slave CI configs
+#
+CONFIG_FMB_COMM_MODE_RTU_EN=n
+CONFIG_FMB_COMM_MODE_ASCII_EN=n
+CONFIG_FMB_COMM_MODE_TCP_EN=y
+CONFIG_FMB_TCP_PORT_DEFAULT=1502
+CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
+CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
+CONFIG_FMB_PORT_TASK_PRIO=10
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_EXT_TYPE_SUPPORT=y
+CONFIG_FMB_TCP_UID_ENABLED=n
+CONFIG_EXAMPLE_CONNECT_IPV6=n
+CONFIG_MB_SLAVE_ADDR=1
+CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
+CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+CONFIG_MB_CONSOLE_HELPER_ENABLED=y
diff --git a/examples/tcp/mb_tcp_slave/sdkconfig.ci.ethernet b/examples/tcp/mb_tcp_slave/sdkconfig.ci.ethernet
index 4706989..62231f5 100644
--- a/examples/tcp/mb_tcp_slave/sdkconfig.ci.ethernet
+++ b/examples/tcp/mb_tcp_slave/sdkconfig.ci.ethernet
@@ -1,20 +1,6 @@
 #
-# Modbus configuration
+# Ethernet-specific configuration
 #
-CONFIG_FMB_COMM_MODE_TCP_EN=y
-CONFIG_FMB_TCP_PORT_DEFAULT=1502
-CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=n
-CONFIG_FMB_COMM_MODE_ASCII_EN=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_EXT_TYPE_SUPPORT=y
-CONFIG_FMB_TCP_UID_ENABLED=n
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_MB_SLAVE_ADDR=1
-CONFIG_EXAMPLE_CONNECT_IPV6=n
 CONFIG_EXAMPLE_CONNECT_WIFI=n
 CONFIG_EXAMPLE_CONNECT_ETHERNET=y
 CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y
@@ -29,7 +15,4 @@ CONFIG_ETH_ENABLED=y
 CONFIG_ETH_USE_ESP32_EMAC=y
 CONFIG_ETH_USE_SPI_ETHERNET=n
 
-CONFIG_HEAP_POISONING_COMPREHENSIVE=y
-CONFIG_HEAP_TRACING_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+CONFIG_FMB_MDNS_INTEGRATION_ENABLE=n
diff --git a/examples/tcp/mb_tcp_slave/sdkconfig.ci.wifi b/examples/tcp/mb_tcp_slave/sdkconfig.ci.wifi
index 12f475b..633c52e 100644
--- a/examples/tcp/mb_tcp_slave/sdkconfig.ci.wifi
+++ b/examples/tcp/mb_tcp_slave/sdkconfig.ci.wifi
@@ -1,23 +1,9 @@
-CONFIG_FMB_COMM_MODE_TCP_EN=y
-CONFIG_FMB_TCP_PORT_DEFAULT=1502
-CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=n
-CONFIG_FMB_COMM_MODE_ASCII_EN=n
-CONFIG_FMB_EXT_TYPE_SUPPORT=y
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TCP_UID_ENABLED=n
-CONFIG_MB_SLAVE_ADDR=1
-CONFIG_EXAMPLE_CONNECT_IPV6=n
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+#
+# WiFi-specific configuration
+#
 CONFIG_EXAMPLE_CONNECT_ETHERNET=n
 CONFIG_EXAMPLE_CONNECT_WIFI=y
 CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}"
 CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}"
 
-CONFIG_HEAP_POISONING_COMPREHENSIVE=y
-CONFIG_HEAP_TRACING_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+CONFIG_FMB_MDNS_INTEGRATION_ENABLE=n
diff --git a/examples/tcp/mb_tcp_slave/sdkconfig.defaults b/examples/tcp/mb_tcp_slave/sdkconfig.defaults
index 6266823..5b4db62 100644
--- a/examples/tcp/mb_tcp_slave/sdkconfig.defaults
+++ b/examples/tcp/mb_tcp_slave/sdkconfig.defaults
@@ -1,23 +1,25 @@
 #
-# Modbus configuration
+# Default configuration options
 #
+CONFIG_FMB_COMM_MODE_RTU_EN=n
+CONFIG_FMB_COMM_MODE_ASCII_EN=n
 CONFIG_FMB_COMM_MODE_TCP_EN=y
 CONFIG_FMB_TCP_PORT_DEFAULT=1502
 CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
 CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
 CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=n
-CONFIG_FMB_COMM_MODE_ASCII_EN=n
 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
+CONFIG_FMB_EXT_TYPE_SUPPORT=y
 CONFIG_FMB_TCP_UID_ENABLED=n
-CONFIG_MB_SLAVE_ADDR=1
-CONFIG_EXAMPLE_CONNECT_IPV6=n
 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}"
-CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}"
+CONFIG_EXAMPLE_CONNECT_IPV6=n
 CONFIG_EXAMPLE_CONNECT_ETHERNET=n
 CONFIG_EXAMPLE_CONNECT_WIFI=y
+CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}"
+CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}"
+CONFIG_MB_SLAVE_ADDR=1
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
 CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+CONFIG_MB_CONSOLE_HELPER_ENABLED=y
 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y # To avoid app partition size warning of Wifi
diff --git a/test_apps/adapter_tests/sdkconfig.defaults b/test_apps/adapter_tests/sdkconfig.ci.defaults
similarity index 75%
rename from test_apps/adapter_tests/sdkconfig.defaults
rename to test_apps/adapter_tests/sdkconfig.ci.defaults
index 9cbaa1c..7d0b2fa 100644
--- a/test_apps/adapter_tests/sdkconfig.defaults
+++ b/test_apps/adapter_tests/sdkconfig.ci.defaults
@@ -1,8 +1,5 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
-#
-# Modbus configuration
+# Default configuration options
 #
 CONFIG_UNITY_ENABLE_FIXTURE=y
 CONFIG_APP_BUILD_USE_FLASH_SECTIONS=n
@@ -16,8 +13,10 @@ CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
 CONFIG_MB_PORT_ADAPTER_EN=y
-CONFIG_MB_TEST_MASTER_TASK_PRIO=4
 CONFIG_MB_TEST_SLAVE_TASK_PRIO=4
+CONFIG_MB_TEST_MASTER_TASK_PRIO=4
 CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
+CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=256
+CONFIG_MB_TEST_LEAK_WARN_LEVEL=256
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
 CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/adapter_tests/sdkconfig.ci.serial b/test_apps/adapter_tests/sdkconfig.ci.serial
index 187544e..ae85cbf 100644
--- a/test_apps/adapter_tests/sdkconfig.ci.serial
+++ b/test_apps/adapter_tests/sdkconfig.ci.serial
@@ -1,24 +1,7 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
+# Serial-specific configuration
 #
-# Modbus configuration
-#
-CONFIG_UNITY_ENABLE_FIXTURE=y
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
 CONFIG_FMB_COMM_MODE_RTU_EN=y
 CONFIG_FMB_COMM_MODE_ASCII_EN=y
 CONFIG_FMB_COMM_MODE_TCP_EN=n
 CONFIG_FMB_TCP_UID_ENABLED=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_MB_PORT_ADAPTER_EN=y
-CONFIG_MB_TEST_SLAVE_TASK_PRIO=4
-CONFIG_MB_TEST_MASTER_TASK_PRIO=4
-CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
-CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=256
-CONFIG_MB_TEST_LEAK_WARN_LEVEL=256
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/adapter_tests/sdkconfig.ci.tcp b/test_apps/adapter_tests/sdkconfig.ci.tcp
index 22fe168..40e73f2 100644
--- a/test_apps/adapter_tests/sdkconfig.ci.tcp
+++ b/test_apps/adapter_tests/sdkconfig.ci.tcp
@@ -1,24 +1,7 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
+# TCP-specific configuration
 #
-# Modbus configuration
-#
-CONFIG_UNITY_ENABLE_FIXTURE=y
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
 CONFIG_FMB_COMM_MODE_RTU_EN=n
 CONFIG_FMB_COMM_MODE_ASCII_EN=n
 CONFIG_FMB_COMM_MODE_TCP_EN=y
 CONFIG_FMB_TCP_UID_ENABLED=y
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_MB_PORT_ADAPTER_EN=y
-CONFIG_MB_TEST_SLAVE_TASK_PRIO=4
-CONFIG_MB_TEST_MASTER_TASK_PRIO=4
-CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
-CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=256
-CONFIG_MB_TEST_LEAK_WARN_LEVEL=256
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/console_helper_test/test_console_helper.py b/test_apps/console_helper_test/pytest_console_helper.py
similarity index 96%
rename from test_apps/console_helper_test/test_console_helper.py
rename to test_apps/console_helper_test/pytest_console_helper.py
index 125edf9..26b5ae3 100644
--- a/test_apps/console_helper_test/test_console_helper.py
+++ b/test_apps/console_helper_test/pytest_console_helper.py
@@ -10,6 +10,7 @@ MB_APP_WAIT_TOUT_SEC = 120
 
 @pytest.mark.parametrize("target", ["esp32"], indirect=True)
 @pytest.mark.multi_dut_modbus_generic
+@pytest.mark.parametrize("config", ["generic"], indirect=True)
 def test_mb_console_helper_flow(
     dut: Dut,
 ) -> None:
diff --git a/test_apps/console_helper_test/sdkconfig.defaults b/test_apps/console_helper_test/sdkconfig.ci.defaults
similarity index 100%
rename from test_apps/console_helper_test/sdkconfig.defaults
rename to test_apps/console_helper_test/sdkconfig.ci.defaults
diff --git a/test_apps/console_helper_test/sdkconfig.ci.generic b/test_apps/console_helper_test/sdkconfig.ci.generic
new file mode 100644
index 0000000..89dd03c
--- /dev/null
+++ b/test_apps/console_helper_test/sdkconfig.ci.generic
@@ -0,0 +1,3 @@
+#
+# Modbus test configuration (kept intentionally)
+#
diff --git a/test_apps/cpp/modbus_serial_cpp_test/pytest_cpp_mb_serial_master_slave.py b/test_apps/cpp/modbus_serial_cpp_test/pytest_cpp_mb_serial_master_slave.py
index 6254b7a..20760bb 100644
--- a/test_apps/cpp/modbus_serial_cpp_test/pytest_cpp_mb_serial_master_slave.py
+++ b/test_apps/cpp/modbus_serial_cpp_test/pytest_cpp_mb_serial_master_slave.py
@@ -8,6 +8,7 @@ MB_APP_WAIT_TOUT_SEC = 30
 
 @pytest.mark.parametrize("target", ["esp32"], indirect=True)
 @pytest.mark.multi_dut_modbus_generic
+@pytest.mark.parametrize("config", ["serial"], indirect=True)
 def test_cpp_mb_serial_master_slave(dut: Dut) -> None:
     dut.expect("Setup master cpp....")
     dut.expect("Modbus master stack initialized...", timeout=MB_APP_WAIT_TOUT_SEC)
diff --git a/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.ci.defaults b/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.ci.defaults
new file mode 100644
index 0000000..289a328
--- /dev/null
+++ b/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.ci.defaults
@@ -0,0 +1,5 @@
+#
+# Common options for modbus_serial_cpp_test CI configs
+#
+CONFIG_LOG_DEFAULT_LEVEL_INFO=n
+CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.ci.serial b/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.ci.serial
new file mode 100644
index 0000000..e2c0359
--- /dev/null
+++ b/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.ci.serial
@@ -0,0 +1,6 @@
+#
+# Modbus test configuration
+#
+CONFIG_FMB_COMM_MODE_RTU_EN=y
+CONFIG_FMB_COMM_MODE_ASCII_EN=y
+CONFIG_FMB_COMM_MODE_TCP_EN=n
diff --git a/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.defaults b/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.defaults
deleted file mode 100644
index 1770e23..0000000
--- a/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# General options for test
-CONFIG_HEAP_POISONING_COMPREHENSIVE=y
-CONFIG_HEAP_TRACING_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/physical_tests/sdkconfig.defaults b/test_apps/physical_tests/sdkconfig.ci.defaults
similarity index 56%
rename from test_apps/physical_tests/sdkconfig.defaults
rename to test_apps/physical_tests/sdkconfig.ci.defaults
index fee7151..0871c5a 100644
--- a/test_apps/physical_tests/sdkconfig.defaults
+++ b/test_apps/physical_tests/sdkconfig.ci.defaults
@@ -1,28 +1,20 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
+# Default configuration options
 #
-# Modbus configuration
-#
-CONFIG_UNITY_ENABLE_FIXTURE=y
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
 CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
 CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=y
-CONFIG_FMB_COMM_MODE_ASCII_EN=y
-CONFIG_FMB_COMM_MODE_TCP_EN=n
-CONFIG_FMB_TCP_UID_ENABLED=y
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_MB_PORT_ADAPTER_EN=n
-CONFIG_MB_TEST_MASTER_TASK_PRIO=5
-CONFIG_MB_TEST_MASTER_TASK_PRIO=5
-CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
 
 # Avoid CI issues "Warning: The smallest app partition is nearly full (5% free space left)!"
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
+CONFIG_MB_TEST_SLAVE_TASK_PRIO=5
+CONFIG_MB_TEST_MASTER_TASK_PRIO=5
+CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
 # Enable debug logging
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
 CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+CONFIG_MB_CONSOLE_HELPER_ENABLED=y
diff --git a/test_apps/physical_tests/sdkconfig.ci.ethernet b/test_apps/physical_tests/sdkconfig.ci.ethernet
index e3705c2..2df3eb7 100644
--- a/test_apps/physical_tests/sdkconfig.ci.ethernet
+++ b/test_apps/physical_tests/sdkconfig.ci.ethernet
@@ -1,18 +1,12 @@
 #
-# Modbus configuration
+# Ethernet-specific configuration
 #
-CONFIG_FMB_COMM_MODE_TCP_EN=y
-CONFIG_FMB_TCP_PORT_DEFAULT=1502
-CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
 CONFIG_FMB_COMM_MODE_RTU_EN=n
 CONFIG_FMB_COMM_MODE_ASCII_EN=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
+CONFIG_FMB_COMM_MODE_TCP_EN=y
 CONFIG_FMB_TCP_UID_ENABLED=n
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_FMB_EXT_TYPE_SUPPORT=y
+CONFIG_FMB_TCP_PORT_DEFAULT=1502
+CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
 
 CONFIG_EXAMPLE_CONNECT_IPV6=n
 CONFIG_EXAMPLE_CONNECT_WIFI=n
@@ -28,7 +22,3 @@ CONFIG_EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE=4096
 CONFIG_ETH_ENABLED=y
 CONFIG_ETH_USE_ESP32_EMAC=y
 CONFIG_ETH_USE_SPI_ETHERNET=n
-
-# Enable debug logging
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/physical_tests/sdkconfig.ci.serial b/test_apps/physical_tests/sdkconfig.ci.serial
index db1d7fe..e8bdee3 100644
--- a/test_apps/physical_tests/sdkconfig.ci.serial
+++ b/test_apps/physical_tests/sdkconfig.ci.serial
@@ -1,30 +1,15 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
+# Serial-specific configuration
 #
-# Modbus configuration
-#
-CONFIG_UNITY_ENABLE_FIXTURE=y
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
+CONFIG_MB_TEST_SLAVE_TASK_PRIO=5
+CONFIG_MB_TEST_MASTER_TASK_PRIO=5
+
 CONFIG_FMB_COMM_MODE_RTU_EN=y
 CONFIG_FMB_COMM_MODE_ASCII_EN=y
 CONFIG_FMB_COMM_MODE_TCP_EN=n
-CONFIG_FMB_TCP_UID_ENABLED=y
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_MB_TEST_SLAVE_TASK_PRIO=5
-CONFIG_MB_TEST_MASTER_TASK_PRIO=5
+CONFIG_FMB_TCP_UID_ENABLED=n
 CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
 CONFIG_MB_PORT_ADAPTER_EN=n
 CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=128
 CONFIG_MB_TEST_LEAK_WARN_LEVEL=128
-
-# Avoid CI issues "Warning: The smallest app partition is nearly full (5% free space left)!"
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-
-# Enable debug logging
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+CONFIG_UNITY_ENABLE_FIXTURE=y
diff --git a/test_apps/physical_tests/sdkconfig.ci.wifi b/test_apps/physical_tests/sdkconfig.ci.wifi
index 141bbd1..a06f24d 100644
--- a/test_apps/physical_tests/sdkconfig.ci.wifi
+++ b/test_apps/physical_tests/sdkconfig.ci.wifi
@@ -1,25 +1,15 @@
-CONFIG_FMB_COMM_MODE_TCP_EN=y
-CONFIG_FMB_TCP_PORT_DEFAULT=502
-CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
+#
+# WiFi-specific configuration
+#
 CONFIG_FMB_COMM_MODE_RTU_EN=n
 CONFIG_FMB_COMM_MODE_ASCII_EN=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
+CONFIG_FMB_COMM_MODE_TCP_EN=y
 CONFIG_FMB_TCP_UID_ENABLED=n
+CONFIG_FMB_TCP_PORT_DEFAULT=502
+CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
+
 CONFIG_EXAMPLE_CONNECT_IPV6=n
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
 CONFIG_EXAMPLE_CONNECT_ETHERNET=n
 CONFIG_EXAMPLE_CONNECT_WIFI=y
 CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}"
 CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}"
-
-
-# Avoid CI issues "Warning: The smallest app partition is nearly full (5% free space left)!"
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-
-# Enable debug logging
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.defaults b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.defaults
similarity index 58%
rename from test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.defaults
rename to test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.defaults
index 65af2a7..6c123d2 100644
--- a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.defaults
+++ b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.defaults
@@ -1,28 +1,26 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
+# Default options for CI configs
 #
-# Modbus configuration
-#
-CONFIG_UNITY_ENABLE_FIXTURE=y
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
 CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
 CONFIG_FMB_PORT_TASK_PRIO=10
 CONFIG_FMB_COMM_MODE_RTU_EN=n
 CONFIG_FMB_COMM_MODE_ASCII_EN=n
 CONFIG_FMB_COMM_MODE_TCP_EN=y
-CONFIG_FMB_TCP_UID_ENABLED=y
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_TCP_UID_ENABLED=n
+CONFIG_FMB_EXT_TYPE_SUPPORT=y
+CONFIG_UNITY_ENABLE_FIXTURE=y
 CONFIG_MB_PORT_ADAPTER_EN=n
-CONFIG_MB_TEST_MASTER_TASK_PRIO=5
-CONFIG_MB_TEST_MASTER_TASK_PRIO=5
-CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
+CONFIG_EXAMPLE_CONNECT_IPV6=n
+CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
 
 # Avoid CI issues "Warning: The smallest app partition is nearly full (5% free space left)!"
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
-# Enable debug logging
+
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
 CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+CONFIG_MB_CONSOLE_HELPER_ENABLED=y
diff --git a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.ethernet b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.ethernet
index 0842092..b847df9 100644
--- a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.ethernet
+++ b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.ethernet
@@ -1,20 +1,7 @@
 #
-# Modbus configuration
+# Ethernet-specific configuration
 #
-CONFIG_FMB_COMM_MODE_TCP_EN=y
 CONFIG_FMB_TCP_PORT_DEFAULT=1502
-CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=n
-CONFIG_FMB_COMM_MODE_ASCII_EN=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TCP_UID_ENABLED=n
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_FMB_EXT_TYPE_SUPPORT=y
-
-CONFIG_EXAMPLE_CONNECT_IPV6=n
 CONFIG_EXAMPLE_CONNECT_WIFI=n
 CONFIG_EXAMPLE_CONNECT_ETHERNET=y
 CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y
@@ -28,5 +15,3 @@ CONFIG_EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE=4096
 CONFIG_ETH_ENABLED=y
 CONFIG_ETH_USE_ESP32_EMAC=y
 CONFIG_ETH_USE_SPI_ETHERNET=n
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.wifi b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.wifi
index 141bbd1..6aeeb8c 100644
--- a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.wifi
+++ b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.wifi
@@ -1,25 +1,8 @@
-CONFIG_FMB_COMM_MODE_TCP_EN=y
+#
+# WiFi-specific configuration
+#
 CONFIG_FMB_TCP_PORT_DEFAULT=502
-CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=n
-CONFIG_FMB_COMM_MODE_ASCII_EN=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TCP_UID_ENABLED=n
-CONFIG_EXAMPLE_CONNECT_IPV6=n
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
 CONFIG_EXAMPLE_CONNECT_ETHERNET=n
 CONFIG_EXAMPLE_CONNECT_WIFI=y
 CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}"
 CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}"
-
-
-# Avoid CI issues "Warning: The smallest app partition is nearly full (5% free space left)!"
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-
-# Enable debug logging
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.defaults b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.defaults
similarity index 61%
rename from test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.defaults
rename to test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.defaults
index 65af2a7..37a1f8a 100644
--- a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.defaults
+++ b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.defaults
@@ -1,21 +1,21 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
-#
-# Modbus configuration
+# Default configuration options
 #
 CONFIG_UNITY_ENABLE_FIXTURE=y
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
 CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
 CONFIG_FMB_PORT_TASK_PRIO=10
 CONFIG_FMB_COMM_MODE_RTU_EN=n
 CONFIG_FMB_COMM_MODE_ASCII_EN=n
 CONFIG_FMB_COMM_MODE_TCP_EN=y
-CONFIG_FMB_TCP_UID_ENABLED=y
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_TCP_UID_ENABLED=n
+CONFIG_FMB_EXT_TYPE_SUPPORT=y
+CONFIG_EXAMPLE_CONNECT_IPV6=n
+CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
 CONFIG_MB_PORT_ADAPTER_EN=n
-CONFIG_MB_TEST_MASTER_TASK_PRIO=5
+CONFIG_MB_TEST_SLAVE_TASK_PRIO=5
 CONFIG_MB_TEST_MASTER_TASK_PRIO=5
 CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
 
@@ -23,6 +23,5 @@ CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
-# Enable debug logging
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
 CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.ethernet b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.ethernet
index 950b6ae..565574b 100644
--- a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.ethernet
+++ b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.ethernet
@@ -1,19 +1,8 @@
 #
-# Modbus configuration
+# Ethernet-specific configuration
 #
-CONFIG_FMB_COMM_MODE_TCP_EN=y
 CONFIG_FMB_TCP_PORT_DEFAULT=1502
-CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=n
-CONFIG_FMB_COMM_MODE_ASCII_EN=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_EXT_TYPE_SUPPORT=y
-CONFIG_FMB_TCP_UID_ENABLED=n
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_EXAMPLE_CONNECT_IPV6=n
+
 CONFIG_EXAMPLE_CONNECT_WIFI=n
 CONFIG_EXAMPLE_CONNECT_ETHERNET=y
 CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y
@@ -27,5 +16,3 @@ CONFIG_EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE=4096
 CONFIG_ETH_ENABLED=y
 CONFIG_ETH_USE_ESP32_EMAC=y
 CONFIG_ETH_USE_SPI_ETHERNET=n
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.wifi b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.wifi
index 141bbd1..8829ecf 100644
--- a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.wifi
+++ b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.wifi
@@ -1,25 +1,5 @@
-CONFIG_FMB_COMM_MODE_TCP_EN=y
 CONFIG_FMB_TCP_PORT_DEFAULT=502
-CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=n
-CONFIG_FMB_COMM_MODE_ASCII_EN=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TCP_UID_ENABLED=n
-CONFIG_EXAMPLE_CONNECT_IPV6=n
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
 CONFIG_EXAMPLE_CONNECT_ETHERNET=n
 CONFIG_EXAMPLE_CONNECT_WIFI=y
 CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}"
 CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}"
-
-
-# Avoid CI issues "Warning: The smallest app partition is nearly full (5% free space left)!"
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-
-# Enable debug logging
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/unit_tests/mb_controller_common/sdkconfig.ci.defaults b/test_apps/unit_tests/mb_controller_common/sdkconfig.ci.defaults
new file mode 100644
index 0000000..631d851
--- /dev/null
+++ b/test_apps/unit_tests/mb_controller_common/sdkconfig.ci.defaults
@@ -0,0 +1,11 @@
+#
+# Common options for mb_controller CI configs
+#
+CONFIG_UNITY_ENABLE_FIXTURE=y
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
+CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
+CONFIG_FMB_PORT_TASK_PRIO=10
+CONFIG_LOG_DEFAULT_LEVEL_INFO=n
+CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/unit_tests/mb_controller_common/sdkconfig.ci.generic b/test_apps/unit_tests/mb_controller_common/sdkconfig.ci.generic
index f70a848..7b8595e 100644
--- a/test_apps/unit_tests/mb_controller_common/sdkconfig.ci.generic
+++ b/test_apps/unit_tests/mb_controller_common/sdkconfig.ci.generic
@@ -1,24 +1,14 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
+# Generic test configuration
 #
-# Modbus configuration
-#
-CONFIG_UNITY_ENABLE_FIXTURE=y
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
 CONFIG_FMB_COMM_MODE_RTU_EN=y
 CONFIG_FMB_COMM_MODE_ASCII_EN=y
 CONFIG_FMB_COMM_MODE_TCP_EN=y
 CONFIG_FMB_TCP_UID_ENABLED=y
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+
 CONFIG_MB_PORT_ADAPTER_EN=n
 CONFIG_MB_TEST_SLAVE_TASK_PRIO=4
 CONFIG_MB_TEST_MASTER_TASK_PRIO=4
 CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
 CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=128
 CONFIG_MB_TEST_LEAK_WARN_LEVEL=128
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/unit_tests/mb_controller_mapping/pytest_mb_controller_mapping.py b/test_apps/unit_tests/mb_controller_mapping/pytest_mb_controller_mapping.py
index d9ee70e..4c5546f 100644
--- a/test_apps/unit_tests/mb_controller_mapping/pytest_mb_controller_mapping.py
+++ b/test_apps/unit_tests/mb_controller_mapping/pytest_mb_controller_mapping.py
@@ -7,6 +7,6 @@ from pytest_embedded import Dut
 
 @pytest.mark.multi_dut_modbus_generic
 @pytest.mark.parametrize("target", ["esp32"], indirect=True)
-@pytest.mark.parametrize("config", ["serial"], indirect=True)
+@pytest.mark.parametrize("config", ["generic"], indirect=True)
 def test_modbus_controller_mapping(dut: Dut) -> None:
     dut.expect_unity_test_output()
diff --git a/test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.serial b/test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.defaults
similarity index 53%
rename from test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.serial
rename to test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.defaults
index f25fe12..45ef67e 100644
--- a/test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.serial
+++ b/test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.defaults
@@ -1,20 +1,18 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
-#
-# Modbus configuration
+# Common options for mb_controller CI configs
 #
 CONFIG_UNITY_ENABLE_FIXTURE=y
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
 CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
 CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=y
-CONFIG_FMB_COMM_MODE_ASCII_EN=y
-CONFIG_FMB_COMM_MODE_TCP_EN=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_MB_PORT_ADAPTER_EN=y
-CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=128
-CONFIG_MB_TEST_LEAK_WARN_LEVEL=128
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
+CONFIG_LOG_DEFAULT_LEVEL_INFO=n
 CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+
+CONFIG_MB_PORT_ADAPTER_EN=y
+CONFIG_MB_TEST_SLAVE_TASK_PRIO=4
+CONFIG_MB_TEST_MASTER_TASK_PRIO=4
+CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
+CONFIG_MB_TEST_LEAK_WARN_LEVEL=128
+CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=128
diff --git a/test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.generic b/test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.generic
new file mode 100644
index 0000000..e2c0359
--- /dev/null
+++ b/test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.generic
@@ -0,0 +1,6 @@
+#
+# Modbus test configuration
+#
+CONFIG_FMB_COMM_MODE_RTU_EN=y
+CONFIG_FMB_COMM_MODE_ASCII_EN=y
+CONFIG_FMB_COMM_MODE_TCP_EN=n
diff --git a/test_apps/unit_tests/mb_controller_mapping/sdkconfig.defaults b/test_apps/unit_tests/mb_controller_mapping/sdkconfig.defaults
deleted file mode 100644
index fd07349..0000000
--- a/test_apps/unit_tests/mb_controller_mapping/sdkconfig.defaults
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
-#
-#
-# Modbus configuration
-#
-CONFIG_UNITY_ENABLE_FIXTURE=y
-CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
-CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_COMM_MODE_RTU_EN=y
-CONFIG_FMB_COMM_MODE_ASCII_EN=y
-CONFIG_FMB_COMM_MODE_TCP_EN=n
-CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
-CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
-CONFIG_MB_PORT_ADAPTER_EN=y
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/unit_tests/mb_ext_types/pytest_mb_endianness_utils.py b/test_apps/unit_tests/mb_ext_types/pytest_mb_endianness_utils.py
index 76fbe59..9c1aa67 100644
--- a/test_apps/unit_tests/mb_ext_types/pytest_mb_endianness_utils.py
+++ b/test_apps/unit_tests/mb_ext_types/pytest_mb_endianness_utils.py
@@ -7,5 +7,6 @@ from pytest_embedded import Dut
 
 @pytest.mark.parametrize("target", ["esp32"], indirect=True)
 @pytest.mark.multi_dut_modbus_generic
+@pytest.mark.parametrize("config", ["generic"], indirect=True)
 def test_mb_endianness_utils(dut: Dut) -> None:
     dut.run_all_single_board_cases()
diff --git a/test_apps/unit_tests/mb_ext_types/sdkconfig.defaults b/test_apps/unit_tests/mb_ext_types/sdkconfig.ci.defaults
similarity index 72%
rename from test_apps/unit_tests/mb_ext_types/sdkconfig.defaults
rename to test_apps/unit_tests/mb_ext_types/sdkconfig.ci.defaults
index bc6c768..e678972 100644
--- a/test_apps/unit_tests/mb_ext_types/sdkconfig.defaults
+++ b/test_apps/unit_tests/mb_ext_types/sdkconfig.ci.defaults
@@ -1,4 +1,6 @@
-# General options for test
+#
+# Default configuration options
+#
 CONFIG_FMB_EXT_TYPE_SUPPORT=y
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
 CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
diff --git a/test_apps/unit_tests/mb_ext_types/sdkconfig.ci.generic b/test_apps/unit_tests/mb_ext_types/sdkconfig.ci.generic
new file mode 100644
index 0000000..8fa4e98
--- /dev/null
+++ b/test_apps/unit_tests/mb_ext_types/sdkconfig.ci.generic
@@ -0,0 +1,3 @@
+#
+# Modbus test configuration (kept for build)
+#
diff --git a/test_apps/unit_tests/test_config_parser/pytest_config_parsing.py b/test_apps/unit_tests/test_config_parser/pytest_config_parsing.py
index fcc3f37..da690d9 100644
--- a/test_apps/unit_tests/test_config_parser/pytest_config_parsing.py
+++ b/test_apps/unit_tests/test_config_parser/pytest_config_parsing.py
@@ -7,5 +7,6 @@ from pytest_embedded import Dut
 
 @pytest.mark.parametrize("target", ["esp32"], indirect=True)
 @pytest.mark.multi_dut_modbus_generic
+@pytest.mark.parametrize("config", ["generic"], indirect=True)
 def test_mb_config_parser(dut: Dut) -> None:
     dut.run_all_single_board_cases()
diff --git a/test_apps/unit_tests/test_config_parser/sdkconfig.ci.defaults b/test_apps/unit_tests/test_config_parser/sdkconfig.ci.defaults
new file mode 100644
index 0000000..863df2e
--- /dev/null
+++ b/test_apps/unit_tests/test_config_parser/sdkconfig.ci.defaults
@@ -0,0 +1,18 @@
+#
+# Default configuration options
+#
+CONFIG_UNITY_ENABLE_FIXTURE=y
+CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
+CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
+CONFIG_FMB_PORT_TASK_PRIO=10
+CONFIG_LOG_DEFAULT_LEVEL_INFO=n
+CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
+
+CONFIG_MB_PORT_ADAPTER_EN=y
+CONFIG_MB_TEST_SLAVE_TASK_PRIO=4
+CONFIG_MB_TEST_MASTER_TASK_PRIO=4
+CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10
+CONFIG_MB_TEST_LEAK_WARN_LEVEL=128
+CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=128
diff --git a/test_apps/unit_tests/test_config_parser/sdkconfig.ci.generic b/test_apps/unit_tests/test_config_parser/sdkconfig.ci.generic
new file mode 100644
index 0000000..2fcf456
--- /dev/null
+++ b/test_apps/unit_tests/test_config_parser/sdkconfig.ci.generic
@@ -0,0 +1,4 @@
+#
+# Modbus test configuration
+#
+CONFIG_FMB_COMM_MODE_TCP_EN=y
diff --git a/test_apps/unit_tests/test_config_parser/sdkconfig.defaults b/test_apps/unit_tests/test_config_parser/sdkconfig.defaults
deleted file mode 100644
index 909ad49..0000000
--- a/test_apps/unit_tests/test_config_parser/sdkconfig.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# General options for test
-CONFIG_UNITY_ENABLE_FIXTURE=y
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y