diff --git a/lib/redfish_client.robot b/lib/redfish_client.robot
index 8dcab88..eeb87cf 100644
--- a/lib/redfish_client.robot
+++ b/lib/redfish_client.robot
@@ -94,16 +94,17 @@
 
 Redfish Delete Request
     [Documentation]  Delete the resource identified by the URI.
-    [Arguments]  ${session_id}
+    [Arguments]  ${uri_suffix}
     ...          ${xauth_token}
     ...          ${timeout}=10
 
     # Description of argument(s):
-    # session_id   Session id.
+    # uri_suffix   The URI to establish connection with
+    #             (e.g. 'SessionService/Sessions/XIApcw39QU').
     # xauth_token  Authentication token.
     # timeout      Timeout in seconds to establish connection with URI.
 
-    ${base_uri} =  Catenate  SEPARATOR=  ${REDFISH_SESSION}${/}  ${session_id}
+    ${base_uri} =  Catenate  SEPARATOR=  ${REDFISH_BASE_URI}  ${uri_suffix}
 
     # Example: "X-Auth-Token: 3la1JUf1vY4yN2dNOwun"
     ${headers} =  Create Dictionary  Content-Type=application/json
diff --git a/redfish_test/test_redfish_interfaces.robot b/redfish_test/test_redfish_interfaces.robot
index 8208d1a..3812797 100644
--- a/redfish_test/test_redfish_interfaces.robot
+++ b/redfish_test/test_redfish_interfaces.robot
@@ -56,7 +56,6 @@
     ${HTTP_OK}           Managers/openbmc/EthernetInterfaces/eth0
     ${HTTP_NOT_FOUND}    /i/dont/exist/
 
-
 *** Keywords ***
 
 Execute Get And Check Response
@@ -82,4 +81,7 @@
 Test Teardown Execution
     [Documentation]  Do the test teardown.
 
-    Redfish Delete Request  ${test_session_id}  ${test_auth_token}
+    ${session_uri} =
+    ...  Catenate  SEPARATOR=  ${REDFISH_SESSION_URI}  ${test_session_id}
+
+    Redfish Delete Request  ${session_uri}  ${test_auth_token}