diff --git a/lib/ipmi_client.robot b/lib/ipmi_client.robot
index e069543..83175dc 100755
--- a/lib/ipmi_client.robot
+++ b/lib/ipmi_client.robot
@@ -7,10 +7,10 @@
 Library         String
 
 *** Variables ***
-${dbusHostIpmicmd1}=   dbus-send --system  /org/openbmc/HostIpmi/1
-${dbusHostIpmiCmdReceivedMsg}=   org.openbmc.HostIpmi.ReceivedMessage
+${dbusHostIpmicmd1}=   dbus-send --system  ${OPENBMC_BASE_URI}HostIpmi/1
+${dbusHostIpmiCmdReceivedMsg}=   ${OPENBMC_BASE_DBUS}.HostIpmi.ReceivedMessage
 ${netfnByte}=          ${EMPTY}
-${cmdByte}   =          ${EMPTY}
+${cmdByte}=            ${EMPTY}
 ${arrayByte}=          array:byte:
 ${IPMI_EXT_CMD}=       ipmitool -I lanplus -C 1 -P
 ${HOST}=               -H