diff --git a/extended/code_update/bmc_code_update.robot b/extended/code_update/bmc_code_update.robot
index e0233ad..dbd3ef8 100644
--- a/extended/code_update/bmc_code_update.robot
+++ b/extended/code_update/bmc_code_update.robot
@@ -217,7 +217,7 @@
     Sleep  30s
 
     ${bmc_cert_content}=  redfish_utils.Get Attribute
-    ...  /redfish/v1/Managers/bmc/Truststore/Certificates/${cert_id}  CertificateString
+    ...  /redfish/v1/Managers/${MANAGER_ID}/Truststore/Certificates/${cert_id}  CertificateString
     Should Contain  ${cert_file_content}  ${bmc_cert_content}
 
     Upload And Activate Image  ${IMAGE_FILE_PATH}
diff --git a/extended/test_bmc_stress_buster.robot b/extended/test_bmc_stress_buster.robot
index 977c8f9..025e4e1 100644
--- a/extended/test_bmc_stress_buster.robot
+++ b/extended/test_bmc_stress_buster.robot
@@ -63,8 +63,8 @@
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_OK}
 
     # Trigger GET REST enumeration.
-    ${resp}=  GET On Session  openbmc  /redfish/v1/Managers/bmc  expected_status=any
-    Log To Console  GET Request /redfish/v1/Managers/bmc
+    ${resp}=  GET On Session  openbmc  /redfish/v1/Managers/${MANAGER_ID}  expected_status=any
+    Log To Console  GET Request /redfish/v1/Managers/${MANAGER_ID}
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_OK}
     Delete All Sessions