diff --git a/tests/ipmi/test_general_ipmi.robot b/tests/ipmi/test_general_ipmi.robot
index 4cd05c6..8c13a1b 100755
--- a/tests/ipmi/test_general_ipmi.robot
+++ b/tests/ipmi/test_general_ipmi.robot
@@ -91,7 +91,8 @@
 Verify Disabling And Enabling IPMI Via Host
     [Documentation]  Verify disabling and enabling IPMI via host.
     [Tags]  Verify_Disabling_And_Enabling_IPMI_Via_Host
-    [Teardown]  Run Inband IPMI Standard Command  lan set 1 access on
+    [Teardown]  Run Keywords  FFDC On Test Case Fail
+    ...  AND  Run Inband IPMI Standard Command  lan set 1 access on
 
     # Disable IPMI and verify
     Run Inband IPMI Standard Command  lan set 1 access off
@@ -127,6 +128,21 @@
     Should Contain  ${lan_print_output}  ${openbmc_ip}
 
 
+Verify IPMI Disable Persistency After BMC Reboot
+    [Documentation]  Verify IPMI disable persistency after BMC reboot.
+    [Tags]  Verify_IPMI_Disable_Persistency_After_BMC_Reboot
+    [Teardown]  Run Keywords  FFDC On Test Case Fail
+    ...  AND  Run Inband IPMI Standard Command  lan set 1 access on
+
+    # Disable IPMI and reboot BMC.
+    Run Inband IPMI Standard Command  lan set 1 access off
+    OBMC Reboot (run)
+
+    # Verify that IPMI remains disabled after reboot.
+    Run Keyword and Expect Error  *Unable to establish IPMI*
+    ...  Run External IPMI Standard Command  lan print
+
+
 Set Asset Tag With Valid String Length
     [Documentation]  Set asset tag with valid string length and verify.
     [Tags]  Set_Asset_Tag_With_Valid_String_Length