diff --git a/lib/common_utils.robot b/lib/common_utils.robot
index 3c3d8e4..b1d3eae 100755
--- a/lib/common_utils.robot
+++ b/lib/common_utils.robot
@@ -303,9 +303,9 @@
     ${ssh_pw_file_path}=  Set Variable  ${output}
 
     ${cmd}=  Catenate  ${ssh_pw_file_path} ${OPENBMC_PASSWORD} -p ${HOST_SOL_PORT}
-    ...  -o "StrictHostKeyChecking no" ${OPENBMC_USERNAME}@${OPENBMC_HOST}
+    ...  -o "StrictHostKeyChecking no" ${OPENBMC_USERNAME}@${OPENBMC_HOST} ${OPENBMC_CONSOLE_CLIENT}
 
-    [Return]  ${cmd}
+    [Return]  ${cmd.strip()}
 
 
 Get SOL Console Pid
diff --git a/lib/resource.robot b/lib/resource.robot
index 1e08066..d15ed70 100755
--- a/lib/resource.robot
+++ b/lib/resource.robot
@@ -80,6 +80,7 @@
 ${HOST_SOL_PORT}    2200
 ${OPENBMC_SERIAL_HOST}      ${EMPTY}
 ${OPENBMC_SERIAL_PORT}      ${EMPTY}
+${OPENBMC_CONSOLE_CLIENT}   ${EMPTY}
 
 # OS related parameters.
 ${OS_HOST}          ${EMPTY}