diff --git a/lib/bmc_network_utils.robot b/lib/bmc_network_utils.robot
index 698809c..772b892 100644
--- a/lib/bmc_network_utils.robot
+++ b/lib/bmc_network_utils.robot
@@ -418,6 +418,21 @@
 
     [Return]  ${nameservers}
 
+CLI Get and Verify Name Servers
+    [Documentation]    Get and Verify the nameserver IPs from /etc/resolv.conf and compare with redfish nameserver.
+    [Arguments]     ${static_name_servers}
+    ...  ${valid_status_codes}=${HTTP_OK}
+
+    # Description of Argument(s):
+    # static_name_servers:   Address for static name server
+
+    ${cli_nameservers}=  CLI Get Nameservers
+    ${cmd_status}=  Run Keyword And Return Status
+    ...  List Should Contain Sub List  ${cli_nameservers}  ${static_name_servers}
+
+    Run Keyword If  '${valid_status_codes}' == '${HTTP_OK}'
+    ...  Should Be True  ${cmd_status}
+    ...  ELSE  Should Be True  ${cmd_status}
 
 Get Network Configuration
     [Documentation]  Get network configuration.
diff --git a/redfish/managers/test_bmc_network_conf.robot b/redfish/managers/test_bmc_network_conf.robot
index f389a35..d1a9fe4 100644
--- a/redfish/managers/test_bmc_network_conf.robot
+++ b/redfish/managers/test_bmc_network_conf.robot
@@ -741,16 +741,7 @@
     ...  valid_status_codes=[${valid_status_codes}, ${HTTP_INTERNAL_SERVER_ERROR}]
 
     # Patch operation takes 1 to 3 seconds to set new value.
-    Sleep  3s
-
-    # Check if newly added DNS server is configured on BMC.
-    ${cli_nameservers}=  CLI Get Nameservers
-    ${cmd_status}=  Run Keyword And Return Status
-    ...  List Should Contain Sub List  ${cli_nameservers}  ${static_name_servers}
-
-    Run Keyword If  '${valid_status_codes}' == '${HTTP_OK}'
-    ...  Should Be True  ${cmd_status} == ${True}
-    ...  ELSE  Should Be True  ${cmd_status} == ${False}
+    Wait Until Keyword Succeeds  1 min  3 sec    CLI Get and Verify Name Servers    ${static_name_servers}  ${valid_status_codes}
 
 Delete Static Name Servers
     [Documentation]  Delete static name servers.