diff --git a/redfish/managers/test_bmc_network_conf.robot b/redfish/managers/test_bmc_network_conf.robot
index 9b07633..6a7c8b4 100644
--- a/redfish/managers/test_bmc_network_conf.robot
+++ b/redfish/managers/test_bmc_network_conf.robot
@@ -110,15 +110,14 @@
 Configure Hostname And Verify
     [Documentation]  Configure hostname via Redfish and verify.
     [Tags]  Configure_Hostname_And_Verify
+    [Teardown]  Run Keywords
+    ...  Configure Hostname  ${hostname}  AND  Validate Hostname On BMC  ${hostname}
 
     ${hostname}=  Redfish_Utils.Get Attribute  ${REDFISH_NW_PROTOCOL_URI}  HostName
 
     Configure Hostname  ${test_hostname}
     Validate Hostname On BMC  ${test_hostname}
 
-    # Revert back to initial hostname.
-    Configure Hostname  ${hostname}
-    Validate Hostname On BMC  ${hostname}
 
 Add Valid IPv4 Address And Verify
     [Documentation]  Add IPv4 Address via Redfish and verify.