diff --git a/security/test_bmc_expire_password.robot b/security/test_bmc_expire_password.robot
index f966b80..00b1c36 100644
--- a/security/test_bmc_expire_password.robot
+++ b/security/test_bmc_expire_password.robot
@@ -26,7 +26,7 @@
     Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
 
     ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-    Should Contain  ${output}  password expiry information changed
+    Should Contain Any  ${output}  password expiry information changed  password changed
 
     ${status}=  Run Keyword And Return Status   Run External IPMI Standard Command  lan print -v
     Should Be Equal  ${status}  ${False}
@@ -39,7 +39,7 @@
 
     Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
     ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-    Should Contain  ${output}  password expiry information changed
+    Should Contain Any  ${output}  password expiry information changed  password changed
 
     ${status}=  Run Keyword And Return Status
     ...  Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
@@ -55,7 +55,7 @@
     Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
 
     ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-    Should Contain  ${output}  password expiry information changed
+    Should Contain Any  ${output}  password expiry information changed  password changed
 
     Redfish.Login
     # Change to a valid password.
@@ -74,7 +74,7 @@
 
    Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
    ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-   Should Contain  ${output}  password expiry information changed
+   Should Contain Any  ${output}  password expiry information changed  password changed
 
    Redfish.Login
    ${status}=  Run Keyword And Return Status
@@ -93,7 +93,7 @@
    Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
 
    ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-   Should Contain  ${output}  password expiry information changed
+   Should Contain Any  ${output}  password expiry information changed  password changed
 
    Verify User Password Expired Using Redfish  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
    # Change to a valid password.
@@ -113,7 +113,7 @@
 
     Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
     ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-    Should Contain  ${output}  password expiry information changed
+    Should Contain Any  ${output}  password expiry information changed  password changed
 
     Verify User Password Expired Using Redfish  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
     Redfish.Login
@@ -132,7 +132,7 @@
 
     Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
     ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-    Should Contain  ${output}  password expiry information changed
+    Should Contain Any  ${output}  password expiry information changed  password changed
 
     Wait Until Page Contains Element  ${xpath_root_button_menu}
     Click Element  ${xpath_root_button_menu}