diff --git a/redfish/managers/test_managers_bmc.robot b/redfish/managers/test_managers_bmc.robot
index fa32133..3537447 100644
--- a/redfish/managers/test_managers_bmc.robot
+++ b/redfish/managers/test_managers_bmc.robot
@@ -80,6 +80,16 @@
     Check For Regex In Journald  ${REBOOT_REGEX}  error_check=${1}
 
 
+Verify Boot Count After BMC Reboot
+    [Documentation]  Verify boot count increments on BMC reboot.
+    [Tags]  Verify_Boot_Count_After_BMC_Reboot
+
+    Set BMC Boot Count  ${0}
+    Redfish OBMC Reboot (off)
+    ${boot_count}=  Get BMC Boot Count
+    Should Be Equal  ${boot_count}  ${1}  msg=Boot count is not incremented.
+
+
 Redfish BMC Manager GracefulRestart When Host Booted
     [Documentation]  BMC graceful restart when host is running.
     [Tags]  Redfish_BMC_Manager_GracefulRestart_When_Host_Booted
diff --git a/tests/test_general_bmc_system.robot b/tests/test_general_bmc_system.robot
deleted file mode 100755
index 7e3a168..0000000
--- a/tests/test_general_bmc_system.robot
+++ /dev/null
@@ -1,31 +0,0 @@
-*** Settings ***
-Documentation  Basic BMC Linux kernel stability test.
-
-Resource           ../lib/utils.robot
-Resource           ../lib/connection_client.robot
-Resource           ../lib/openbmc_ffdc.robot
-Resource           ../lib/state_manager.robot
-
-Suite Setup        Open Connection And Log In
-Suite Teardown     Close All Connections
-
-# TODO: Collect proc data from system as part of FFDC
-# Refer openbmc/openbmc-test-automation#353
-Test Teardown      FFDC On Test Case Fail
-
-*** Variables ***
-
-
-*** Test Cases ***
-
-Verify Boot Count After BMC Reboot
-    [Documentation]  Verify boot count increments on BMC reboot.
-    [Tags]  Verify_Boot_Count_After_BMC_Reboot
-
-    Set BMC Boot Count  ${0}
-    Initiate BMC Reboot
-    Wait Until Keyword Succeeds  10 min  10 sec  Is BMC Ready
-
-    ${boot_count}=  Get BMC Boot Count
-    Should Be Equal  ${boot_count}  ${1}
-    ...  msg=Boot count is not incremented.