diff --git a/robot/resources/oof_interface.robot b/robot/resources/oof_interface.robot
index 7a061ec..fc59526 100644
--- a/robot/resources/oof_interface.robot
+++ b/robot/resources/oof_interface.robot
@@ -1,25 +1,41 @@
 *** Settings ***
-Documentation     The main interface for interacting with OOF
+Documentation     The main interface for interacting with OOF: SNIRO and Homing Service
 Library           RequestsLibrary
 
 Resource          global_properties.robot
 
 *** Variables ***
-${OOF_HEALTH_CHECK_PATH}        /api/oof/v1/healthcheck
-${OOF_ENDPOINT}     ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_IP_ADDR}:${GLOBAL_OOF_SERVER_PORT}
+${OOF_HOMING_HEALTH_CHECK_PATH}       /v1/plans/healthcheck
+${OOF_SNIRO_HEALTH_CHECK_PATH}        /api/oof/v1/healthcheck
 
+${OOF_HOMING_ENDPOINT}    ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT}
+${OOF_SNIRO_ENDPOINT}     ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_IP_ADDR}:${GLOBAL_OOF_SNIRO_SERVER_PORT}
 
 *** Keywords ***
-Run OOF Health Check
-     [Documentation]    Runs OOF Health check
-     ${resp}=    Run OOF Get Request    ${OOF_HEALTH_CHECK_PATH}
+Run OOF-Homing Health Check
+     [Documentation]    Runs OOF-Homing Health check
+     ${resp}=    Run OOF-Homing Get Request    ${OOF_HOMING_HEALTH_CHECK_PATH}
      Should Be Equal As Integers   ${resp.status_code}   200
 
-Run OOF Get Request
-     [Documentation]    Runs OOF Get request
+Run OOF-Homing Get Request
+     [Documentation]    Runs OOF-Homing Get request
      [Arguments]    ${data_path}
-     ${session}=    Create Session   session   ${OOF_ENDPOINT}
+     ${session}=    Create Session   session   ${OOF_HOMING_ENDPOINT}
      ${resp}=   Get Request   session   ${data_path}
      Should Be Equal As Integers   ${resp.status_code}   200
-     Log    Received response from OOF ${resp.text}
+     Log    Received response from OOF-Homing ${resp.text}
+     [Return]    ${resp}
+ 
+Run OOF-SNIRO Health Check
+     [Documentation]    Runs OOF-SNIRO Health check
+     ${resp}=    Run OOF-SNIRO Get Request    ${OOF_SNIRO_HEALTH_CHECK_PATH}
+     Should Be Equal As Integers   ${resp.status_code}   200
+
+Run OOF-SNIRO Get Request
+     [Documentation]    Runs OOF-SNIRO Get request
+     [Arguments]    ${data_path}
+     ${session}=    Create Session   session   ${OOF_SNIRO_ENDPOINT}
+     ${resp}=   Get Request   session   ${data_path}
+     Should Be Equal As Integers   ${resp.status_code}   200
+     Log    Received response from OOF-SNIRO ${resp.text}
      [Return]    ${resp}
diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index 6f9c984..6adf3ad 100644
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -87,9 +87,13 @@
      [Tags]    health    multicloud
      Run MSB Get Request  /api/multicloud-vio/v0/swagger.json
 
-Basic OOF Health Check
+Basic OOF-Homing Health Check
     [Tags]    health    core
-    Run OOF Health Check
+    Run OOF-Homing Health Check
+
+Basic OOF-SNIRO Health Check
+    [Tags]    health    core
+    Run OOF-SNIRO Health Check
 
 Basic Policy Health Check
     [Tags]    health    core