diff --git a/openpower/mpipl/test_mpipl_basic.robot b/openpower/mpipl/test_mpipl_basic.robot
index ca1498b..5fd0507 100644
--- a/openpower/mpipl/test_mpipl_basic.robot
+++ b/openpower/mpipl/test_mpipl_basic.robot
@@ -143,7 +143,7 @@
     #       "Name": "System Dump Entry",
     #       "OEMDiagnosticDataType": "System"
     #   }
-    ${sys_dump}=  Redfish.Get Properties  /redfish/v1/Systems/system/LogServices/Dump/Entries
+    ${sys_dump}=  Redfish.Get Properties  /redfish/v1/Systems/${SYSTEM_ID}/LogServices/Dump/Entries
     Log To Console  System dump generated: ${sys_dump['Members@odata.count']}
     Should Be True  ${sys_dump['Members@odata.count']} == 1  msg=No system dump generated.
 
diff --git a/openpower/pel/test_bmc_pel.robot b/openpower/pel/test_bmc_pel.robot
index ec51e45..5ba76a6 100644
--- a/openpower/pel/test_bmc_pel.robot
+++ b/openpower/pel/test_bmc_pel.robot
@@ -165,9 +165,9 @@
     #    [Serial Number]:                              ABCDEFG    <---- Serial number
     #    [Sub-section type]:                           0
 
-    ${redfish_machine_model}=  Redfish.Get Attribute  /redfish/v1/Systems/system/  Model
+    ${redfish_machine_model}=  Redfish.Get Attribute  /redfish/v1/Systems/${SYSTEM_ID}/  Model
     ${redfish_machine_model}=  Replace String Using Regexp  ${redfish_machine_model}  ^0+  ${EMPTY}
-    ${redfish_serial_number}=  Redfish.Get Attribute  /redfish/v1/Systems/system/  SerialNumber
+    ${redfish_serial_number}=  Redfish.Get Attribute  /redfish/v1/Systems/${SYSTEM_ID}/  SerialNumber
     ${redfish_serial_number}=  Replace String Using Regexp  ${redfish_serial_number}  ^0+  ${EMPTY}
 
     Valid Value  pel_machine_type_model  ['${redfish_machine_model}']
@@ -267,7 +267,7 @@
     #    [BMC Event Log Id]:           341      <---- BMC event log id value
     #    [Committed at]:               03/25/1920 12:06:22
 
-    ${redfish_event_logs}=  Redfish.Get Properties  /redfish/v1/Systems/system/LogServices/EventLog/Entries
+    ${redfish_event_logs}=  Redfish.Get Properties  /redfish/v1/Systems/${SYSTEM_ID}/LogServices/EventLog/Entries
 
     # Example of redfish_event_logs output:
     # redfish_event_logs:
diff --git a/openpower/test_timed_power_on.robot b/openpower/test_timed_power_on.robot
index 0fe7517..2f24511 100644
--- a/openpower/test_timed_power_on.robot
+++ b/openpower/test_timed_power_on.robot
@@ -119,7 +119,7 @@
     # Description of argument(s):
     # power_policy_mode           BIOS attribute value. E.g. "Stay On", "Automatic".
 
-    Redfish.Patch  /redfish/v1/Systems/system/Bios/Settings
+    Redfish.Patch  /redfish/v1/Systems/${SYSTEM_ID}/Bios/Settings
     ...  body={"Attributes":{"pvm_system_power_off_policy": "${power_policy_mode}"}}
     ...  valid_status_codes=[${HTTP_OK}]