diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9f08a5..c2bfb36 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,6 +113,7 @@ after_script:
     - *check_idf_ver
     # This is workaround to build library under esp-idf v4.4
     - pip install idf-component-manager --upgrade
+    - ${IDF_PATH}/install.sh --enable-ci
     - cd ${TEST_DIR}/test_apps
     - *build_cur_folder
     - cd ${TEST_DIR}/examples
diff --git a/examples/serial/pytest_mb_master_slave.py b/examples/serial/pytest_mb_master_slave.py
index 901c3a0..18ca280 100644
--- a/examples/serial/pytest_mb_master_slave.py
+++ b/examples/serial/pytest_mb_master_slave.py
@@ -43,7 +43,7 @@ test_configs = [
     'ascii'
 ]
 
-@pytest.mark.esp32
+@pytest.mark.parametrize('target', ['esp32'], indirect=True)
 @pytest.mark.multi_dut_modbus_serial
 @pytest.mark.parametrize('config', test_configs, indirect=True)
 @pytest.mark.parametrize(
@@ -65,7 +65,8 @@ def test_modbus_serial_communication(config: str, dut: Tuple[ModbusTestDut, Modb
     dut_slave.dut_check_errors()
     dut_master.dut_check_errors()
 
+@pytest.mark.parametrize('target', ['esp32'], indirect=True)
 @pytest.mark.multi_dut_modbus_generic
 @pytest.mark.parametrize('config', ['dummy_config'])
 def test_modbus_serial_generic(config) -> None:
-    print('The generic serial example tests are not provided yet.')
\ No newline at end of file
+    print('The generic serial example tests are not provided yet.')
diff --git a/examples/tcp/pytest_mb_tcp_host_test_slave.py b/examples/tcp/pytest_mb_tcp_host_test_slave.py
index a99df5f..8bd972b 100644
--- a/examples/tcp/pytest_mb_tcp_host_test_slave.py
+++ b/examples/tcp/pytest_mb_tcp_host_test_slave.py
@@ -37,7 +37,7 @@ pattern_dict_slave = {Stages.STACK_IPV4: (r'I \([0-9]+\) example_[a-z]+: - IPv4
                       Stages.STACK_DESTROY: (r'I\s\(([0-9]+)\) SLAVE_TEST: (Modbus controller destroyed).')}
 
 
-@pytest.mark.esp32
+@pytest.mark.parametrize('target', ['esp32'], indirect=True)
 @pytest.mark.multi_dut_modbus_tcp
 @pytest.mark.parametrize('config', ['ethernet'], indirect=True)
 @pytest.mark.parametrize(
diff --git a/examples/tcp/pytest_mb_tcp_master_slave.py b/examples/tcp/pytest_mb_tcp_master_slave.py
index 935ede1..fa881ef 100644
--- a/examples/tcp/pytest_mb_tcp_master_slave.py
+++ b/examples/tcp/pytest_mb_tcp_master_slave.py
@@ -42,7 +42,7 @@ test_configs = [
     'ethernet'
 ]
 
-@pytest.mark.esp32
+@pytest.mark.parametrize('target', ['esp32'], indirect=True)
 @pytest.mark.multi_dut_modbus_tcp
 @pytest.mark.parametrize('config', test_configs, indirect=True)
 @pytest.mark.parametrize(
@@ -67,6 +67,7 @@ def test_modbus_tcp_communication(dut: Tuple[ModbusTestDut, ModbusTestDut]) -> N
     dut_slave.dut_check_errors()
     dut_master.dut_check_errors()
 
+@pytest.mark.parametrize('target', ['esp32'], indirect=True)
 @pytest.mark.multi_dut_modbus_generic
 @pytest.mark.parametrize('config', ['dummy_config'])
 def test_modbus_tcp_generic(config) -> None: