diff --git a/redfish/systems/eventlog/test_event_service.robot b/redfish/systems/eventlog/test_event_service.robot
index ab25fdf..e4a71a8 100644
--- a/redfish/systems/eventlog/test_event_service.robot
+++ b/redfish/systems/eventlog/test_event_service.robot
@@ -1,33 +1,27 @@
 *** Settings ***
-Documentation    Test Redfish event service.
+Documentation    Test Redfish event service subscription function.
 
 Resource         ../../../lib/resource.robot
 Resource         ../../../lib/bmc_redfish_resource.robot
 Resource         ../../../lib/openbmc_ffdc.robot
 Resource         ../../../lib/bmc_redfish_utils.robot
 
+Suite Setup      Suite Setup Execution
+Suite teardown   Suite Teardown Execution
+
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
-Suite Setup      Suite Setup Execution
-Suite teardown   Run Keyword And Ignore Error  Delete All Redfish Sessions
 
 ***Variables***
 
-${REMOTE_SERVER_IP}
+# override this default using -v REMOTE_SERVER_IP:<IP> from CLI
+${REMOTE_SERVER_IP}    10.7.7.7
 
 ** Test Cases **
 
-Verify Event Service Available
-    [Documentation]  Verify Redfish event service is available.
-    [Tags]  Verify_Event_Service_Available
-
-    ${resp} =  Redfish_utils.Get Attribute  /redfish/v1/EventService  ServiceEnabled
-    Should Be Equal As Strings  ${resp}  ${True}
-
-
-Verify Subscribe An Event
-    [Documentation]  Subscribe to an event and verify.
-    [Tags]  Verify_Subscribe_An_Event
+Verify Add Subscribe Server For Event Notification
+    [Documentation]  Subscribe a remote server and verify if added successful.
+    [Tags]  Verify_Add_Subscribe_Server_For_Event_Notification
 
     ${subscription_list}=  Redfish_Utils.Get Member List
     ...  /redfish/v1/EventService/Subscriptions
@@ -61,23 +55,38 @@
     Should Not be Empty  ${REMOTE_SERVER_IP}
     Should Not be Empty  ${HTTPS_PORT}
 
+    Redfish.Login
+
+
+Suite Teardown Execution
+    [Documentation]  Do the suite teardown.
+
+    Run Keyword And Ignore Error  Delete All Redfish Sessions
+    Run Keyword And Ignore Error  Redfish.Logout
+
 
 Test Setup Execution
     [Documentation]  Do the test setup.
 
-    Redfish.Login
-
     ${subscription_list}=  Redfish_Utils.Get Member List
     ...  /redfish/v1/EventService/Subscriptions
 
     Delete All Subscriptions  ${subscription_list}
 
+    # Verify Redfish event service attribute ServiceEnabled is set to True.
+    ${resp} =  Redfish_utils.Get Attribute  /redfish/v1/EventService  ServiceEnabled
+    Should Be Equal As Strings  ${resp}  ${True}
+
 
 Test Teardown Execution
     [Documentation]  Do the post test teardown.
 
     FFDC On Test Case Fail
-    Run Keyword And Ignore Error  Redfish.Logout
+
+    ${subscription_list}=  Redfish_Utils.Get Member List
+    ...  /redfish/v1/EventService/Subscriptions
+
+    Delete All Subscriptions  ${subscription_list}
 
 
 Delete All Subscriptions