diff --git a/redfish/managers/test_managers_bmc_time.robot b/redfish/managers/test_managers_bmc_time.robot
index 1e81270..cf75895 100644
--- a/redfish/managers/test_managers_bmc_time.robot
+++ b/redfish/managers/test_managers_bmc_time.robot
@@ -10,7 +10,7 @@
 
 Test Teardown                Test Teardown Execution
 Suite Setup                  Suite Setup Execution
-Suite Teardown               Redfish.Logout
+Suite Teardown               Suite Teardown Execution
 
 *** Variables ***
 ${max_time_diff_in_seconds}  6
@@ -117,7 +117,6 @@
     ...  msg=NTP server value ${ntp_server_1} not stored.
     Should Contain  ${network_protocol["NTP"]["NTPServers"]}  ${ntp_server_2}
     ...  msg=NTP server value ${ntp_server_2} not stored.
-    Redfish.Logout
 
 
 Verify Enable NTP
@@ -189,3 +188,9 @@
 
     Printn
     Redfish.Login
+    Rest Set Time Owner
+
+Suite Teardown Execution
+    [Documentation]  Do the suite level teardown.
+    Rest Set Time Owner
+    Redfish.Logout