diff --git a/tests/test_bmc_reboot.robot b/tests/test_bmc_reboot.robot
new file mode 100644
index 0000000..87c05d5
--- /dev/null
+++ b/tests/test_bmc_reboot.robot
@@ -0,0 +1,32 @@
+*** Settings ***
+Documentation           This suite is for testing OCC: Power capping setting
+
+Resource                ../lib/rest_client.robot
+Resource                ../lib/utils.robot
+Resource                ../lib/connection_client.robot
+Resource                ../lib/openbmc_ffdc.robot
+Resource                ../lib/boot_utils.robot
+Resource                ../lib/bmc_ssh_utils.py
+
+Force Tags  bmcreboot
+
+Suite Setup             Open Connection And Log In
+Suite Teardown          Close All Connections
+Test Teardown           FFDC On Test Case Fail
+
+*** Variables ***
+${SYSTEM_SHUTDOWN_TIME}    ${5}
+
+*** Test Cases ***
+
+Test BMC Reboot via REST
+    [Documentation]   This test case is to verify bmc reboot using REST.
+    [Tags]  Test_BMC_Reboot_via_REST
+
+    ${test_file_path}=  Set Variable  /tmp/before_bmcreboot
+    BMC Execute Command  touch ${test_file_path}
+
+    REST OBMC Reboot (off)  stack_mode=normal
+
+    BMC Execute Command  if [ -f ${test_file_path} ] ; then false ; fi
+
diff --git a/tests/test_warm_reset.robot b/tests/test_warm_reset.robot
deleted file mode 100644
index 00de7c0..0000000
--- a/tests/test_warm_reset.robot
+++ /dev/null
@@ -1,48 +0,0 @@
-*** Settings ***
-Documentation           This suite is for testing OCC: Power capping setting
-
-Resource                ../lib/rest_client.robot
-Resource                ../lib/utils.robot
-Resource                ../lib/connection_client.robot
-Resource                ../lib/openbmc_ffdc.robot
-
-Force Tags  bmcreboot
-
-Suite Setup             Open Connection And Log In
-Suite Teardown          Close All Connections
-Test Teardown           FFDC On Test Case Fail
-
-*** Variables ***
-${SYSTEM_SHUTDOWN_TIME}    ${5}
-
-*** Test Cases ***
-
-Test WarmReset via REST
-    [Documentation]   This testcase is to verify warm reset using REST.
-    [Tags]  Test_WarmReset_via_REST
-
-    ${warm_test_file}=  Set Variable    /tmp/before_warmreset
-    Open Connection And Log In
-    ${stdout}   ${stderr}   ${rc}=
-    ...   Execute Command   touch ${warm_test_file}
-    ...   return_stderr=True  return_rc=True
-    Should Be Equal   ${rc}   ${0}   Unable to create file - ${warm_test_file}
-
-    Trigger Warm Reset
-    ${max_wait_time}=
-    ...   Evaluate    ${SYSTEM_SHUTDOWN_TIME}+${OPENBMC_REBOOT_TIMEOUT}
-
-    Open Connection And Log In
-    ${uptime}=
-    ...   Execute Command    cut -d " " -f 1 /proc/uptime| cut -d "." -f 1
-    ${uptime}=  Convert To Integer  ${uptime}
-    ${uptime}=  Evaluate   ${uptime}/60
-    Should Be True  ${uptime}<${max_wait_time}
-    Open Connection And Log In
-    ${stdout}   ${stderr}   ${rc}=
-    ...   Execute Command     ls ${warm_test_file}
-    ...   return_stderr=True  return_rc=True
-    Should Be Equal    ${rc}   ${1}
-    ...    File ${warm_test_file} persist after BMC rebooted
-
-*** Keywords ***