diff --git a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
index e413b56..a184c08 100644
--- a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
@@ -73,6 +73,8 @@
 Verify LDAP Configurations Editable
     [Documentation]  Verify LDAP configurations are editable.
     [Tags]  Verify_LDAP_Configurations_Editable
+    [Setup]  Redfish.Login
+    [Teardown]  Redfish.Logout
 
     Create LDAP Configuration  ${LDAP_SERVER_URI}  ${LDAP_TYPE}  ${LDAP_BIND_DN}
     ...  ${LDAP_BIND_DN_PASSWORD}  ${LDAP_BASE_DN}
diff --git a/gui/gui_test/settings_menu/test_network_sub_menu.robot b/gui/gui_test/settings_menu/test_network_sub_menu.robot
index 8cc9905..d4b1c57 100644
--- a/gui/gui_test/settings_menu/test_network_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_network_sub_menu.robot
@@ -134,6 +134,8 @@
 Configure Static IPv4 Netmask Via GUI And Verify
     [Documentation]  Login to GUI Network page, configure static IPv4 netmask and verify.
     [Tags]  Configure_Static_IPv4_Netmask_Via_GUI_And_Verify
+    [Setup]  Redfish.Login
+    [Teardown]  Redfish.Logout
     [Template]  Add Static IP Address And Verify
 
     # ip_addresses      subnet_masks             gateway          expected_status
@@ -161,6 +163,8 @@
 Configure And Verify Static IP Address
     [Documentation]  Login to GUI Network page, configure static ip address and verify.
     [Tags]  Configure_And_Verify_Static_IP_Address
+    [Setup]  Redfish.Login
+    [Teardown]  Redfish.Logout
 
     Add Static IP Address And Verify  ${test_ipv4_addr}  ${test_subnet_mask}  ${default_gateway}  Success
 
diff --git a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
index 7d0c4ee..24cf8a5 100644
--- a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
@@ -9,7 +9,7 @@
 
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
-
+Suite Teardown  Run Keywords  Redfish.Logout  AND  Close Browser
 
 *** Variables ***
 
@@ -243,6 +243,8 @@
     Click Element  ${xpath_snmp_alerts_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  snmp-alerts
     Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
+    Redfish.Login
+
 
 Configure SNMP Manager Via GUI
     [Documentation]  Configure SNMP manager via GUI.