diff --git a/.github/workflows/tck-test.yml b/.github/workflows/tck-test.yml
index a97cd4a9..256312f5 100644
--- a/.github/workflows/tck-test.yml
+++ b/.github/workflows/tck-test.yml
@@ -89,11 +89,11 @@ jobs:
                 if ("ue2" in feature){
                   for (var language_two in feature["ue2"]){
                     var second_ue = feature["ue2"][language_two]
-                    var command_str = "behave --define uE1=" + port_language + " --define uE2=" + second_ue + " --define transport1=" + port_transport +  " --define transport2=" + port_transport + " --format json --outfile './reports/" + feature["feature_name"] + "_" + port_language + "_" + second_ue + ".json' --format html --outfile './reports/" + feature["feature_name"] + "_" + port_language + "_" + second_ue + ".html' './features/tests/" + feature["path"] + "/" + feature["feature_name"] + ".feature'"
+                    var command_str = "behave --define uE1=" + port_language + " --define uE2=" + second_ue + " --define transport1=" + port_transport +  " --define transport2=" + port_transport + " --format json --outfile './reports/" + feature["feature_name"] + "_" + port_language + "_" + second_ue + ".json' --format html --outfile './reports/" + feature["feature_name"] + "_" + port_language + "_" + second_ue + "_" + port_transport + ".html' './features/tests/" + feature["path"] + "/" + feature["feature_name"] + ".feature'"
                     command_list.push(command_str);
                   }
                 } else {
-                  var command_str = "behave --define uE1=" + port_language + " --define transport1=" + port_transport + " --format json --outfile './reports/" + feature["feature_name"] + "_" + port_language + ".json' --format html --outfile './reports/" + feature["feature_name"] + "_" + port_language + ".html' './features/tests/" + feature["path"] + "/" + feature["feature_name"] + ".feature'"
+                  var command_str = "behave --define uE1=" + port_language + " --define transport1=" + port_transport + " --format json --outfile './reports/" + feature["feature_name"] + "_" + port_language + ".json' --format html --outfile './reports/" + feature["feature_name"] + "_" + port_language + "_" + port_transport + ".html' './features/tests/" + feature["path"] + "/" + feature["feature_name"] + ".feature'"
                   command_list.push(command_str);
                 }
               }
diff --git a/scripts/install_cpp_test_agent.py b/scripts/install_cpp_test_agent.py
index 7df3d3f3..7f084154 100644
--- a/scripts/install_cpp_test_agent.py
+++ b/scripts/install_cpp_test_agent.py
@@ -37,6 +37,10 @@ def main():
     parser.add_argument(
         '--up-client-socket-version', type=str, help='Specify the version of up_client_socket', required=False
     )
+    parser.add_argument('--zenohc-version', type=str, help='Specify the version of zenohc', required=False)
+    parser.add_argument('--zenohcpp-version', type=str, help='Specify the version of zenohcpp', required=False)
+    parser.add_argument('--up-transport-zenoh-cpp', type=str, help='Specify the version of zenohcpp', required=False)
+
     args = parser.parse_args()
 
     repo_url = "https://github.com/eclipse-uprotocol/up-conan-recipes.git"
@@ -74,6 +78,32 @@ def main():
                 ]
             )
 
+        # Install zenohc
+        print("Install zenohc")
+        if args.zenohc_version:
+            run_command(["conan", "create", "zenohc-tmp/prebuilt", "--version", args.zenohc_version, "--build=missing"])
+
+        # Install zenohcpp
+        print("Install zenohcpp")
+        if args.zenohcpp_version:
+            run_command(
+                ["conan", "create", "zenohcpp-tmp/from-source", "--version", args.zenohcpp_version, "--build=missing"]
+            )
+
+        # Install up-transport-zenoh-cpp
+        print("Install up-transport-zenoh-cpp")
+        if args.up_transport_zenoh_cpp:
+            run_command(
+                [
+                    "conan",
+                    "create",
+                    "up-transport-zenoh-cpp/developer/",
+                    "--version",
+                    args.up_transport_zenoh_cpp,
+                    "--build=missing",
+                ]
+            )
+
         with change_directory(os.path.abspath(os.path.join("..", "..", "test_agent", "cpp"))):
             # Build the CPP test agent executable
             print("Build the CPP test agent executable")
diff --git a/scripts/install_dependencies.py b/scripts/install_dependencies.py
index a38ac00e..c5d5bef0 100644
--- a/scripts/install_dependencies.py
+++ b/scripts/install_dependencies.py
@@ -94,7 +94,10 @@ def main():
         "python install_cpp_test_agent.py "
         "--up-core-api-version 1.6.0 "
         "--up-cpp-version 1.0.1-rc1 "
-        "--up-client-socket-version 1.0.0-dev"
+        "--up-client-socket-version 1.0.0-dev "
+        "--zenohc-version 1.0.0-rc5 "
+        "--zenohcpp-version 1.0.0-rc5 "
+        "--up-transport-zenoh-cpp 1.0.0-dev"
     )
 
 
diff --git a/test_manager/testData/workflow_test_data.json b/test_manager/testData/workflow_test_data.json
index b11c2559..0783f8bb 100644
--- a/test_manager/testData/workflow_test_data.json
+++ b/test_manager/testData/workflow_test_data.json
@@ -18,19 +18,32 @@
         "ue1": ["python", "cpp", "java"],
         "transports": ["socket"]
     },
+    {
+        "feature_name" : "register_and_send",
+        "path": "transport_rpc",
+        "ue1": ["cpp"],
+        "ue2": ["cpp"],
+        "transports": ["zenoh"]
+    },
+    {
+        "feature_name" : "register_and_unregister",
+        "path": "transport_rpc",
+        "ue1": ["cpp"],
+        "transports": ["zenoh"]
+    },
     {
         "feature_name" : "notification_sink_and_source",
         "path": "L2_APIs",
         "ue1": ["cpp"],
         "ue2": ["cpp"],
-        "transports": ["socket"]
+        "transports": ["socket", "zenoh"]
     },
     {
         "feature_name" : "publish_and_subscribe",
         "path": "L2_APIs",
         "ue1": ["cpp"],
         "ue2": ["cpp"],
-        "transports": ["socket"]
+        "transports": ["socket", "zenoh"]
     },
     {
         "feature_name" : "rpc_server_and_client",
@@ -38,6 +51,6 @@
         "ue1": ["cpp"],
         "ue2": ["cpp"],
         "transports": ["socket"]
-    } 
+    }
 
 ]
\ No newline at end of file