diff --git a/redfish/extended/test_basic_ci.robot b/redfish/extended/test_basic_ci.robot
new file mode 100644
index 0000000..5064324
--- /dev/null
+++ b/redfish/extended/test_basic_ci.robot
@@ -0,0 +1,99 @@
+*** Settings ***
+Documentation  Test for HW CI.
+
+Library             DateTime
+
+Resource            ../../lib/utils.robot
+Resource            ../../lib/ipmi_client.robot
+Resource            ../../lib/boot_utils.robot
+Resource            ../../lib/openbmc_ffdc.robot
+Resource            ../../lib/bmc_redfish_resource.robot
+
+Test Setup          Printn
+Test Teardown       FFDC On Test Case Fail
+
+*** Variables ***
+
+# Error strings to check from journald.
+${ERROR_REGEX}     SEGV|core-dump|FAILURE|Failed to start
+${STANDBY_REGEX}   Startup finished in
+
+# 3 minutes standby boot time.
+${startup_time_threshold}  180
+
+*** Test Cases ***
+
+Verify Application Services Running At Standby
+    [Documentation]  Check if there are services that have not completed.
+    [Tags]  Verify_Application_Services_Running_At_Standby
+
+    # Application services running on the BMC are not tightly coupled.
+    # At standby, there shouldn't be any pending job waiting to complete.
+    # Examples:
+    # Failure o/p:
+    # root@witherspoon:~# systemctl list-jobs --no-pager | cat
+    #    JOB UNIT                                     TYPE  STATE
+    # 35151 xyz.openbmc_project.ObjectMapper.service start running
+    # 1 jobs listed.
+    #
+    # Success o/p:
+    # root@witherspoon:~# systemctl list-jobs --no-pager | cat
+    # No jobs running.
+
+    Redfish Hard Power Off
+    ${stdout}  ${stderr}  ${rc}=  BMC Execute Command
+    ...  systemctl list-jobs --no-pager | cat
+    Should Be Equal As Strings  ${stdout}  No jobs running.
+
+
+Verify Front And Rear LED At Standby
+    [Documentation]  Front and Rear LED should be off at standby.
+    [Tags]  Verify_Front_And_Rear_LED_At_Standby
+
+    Redfish Power Off  stack_mode=skip  quiet=1
+    Verify Identify LED State  ${0}
+
+
+Check For Application Failures
+    [Documentation]  Parse the journal log and check for failures.
+    [Tags]  Check_For_Application_Failures
+
+    Check For Regex In Journald  ${ERROR_REGEX}  error_check=${0}  boot=-b
+
+
+Verify Uptime Average Against Threshold
+    [Documentation]  Compare BMC average boot time to a constant threshold.
+    [Tags]  Verify_Uptime_Average_Against_Threshold
+
+    Redfish OBMC Reboot (off)
+
+    Wait Until Keyword Succeeds
+    ...  1 min  30 sec  Check BMC Uptime Journald
+
+
+Test SSH And IPMI Connections
+    [Documentation]  Try SSH and IPMI commands to verify each connection.
+    [Tags]  Test_SSH_And_IPMI_Connections
+
+    BMC Execute Command  true
+    Run IPMI Standard Command  chassis status
+
+
+*** Keywords ***
+
+Check BMC Uptime Journald
+    [Documentation]  Check BMC journald uptime entry.
+
+    # Example output:
+    # Startup finished in 10.074s (kernel) + 2min 23.506s (userspace) = 2min 33.581s.
+    ${startup_time}  ${stderr}  ${rc}=  BMC Execute Command
+    ...  journalctl --no-pager | egrep '${STANDBY_REGEX}' | tail -1
+    Should Not Be Empty  ${startup_time}
+
+    # Example time conversion:
+    # Get the "2min 33.581s" string total time taken to reach standby.
+    # Convert time "2min 33.581s" to unit 153.581.
+    ${startup_time}=  Convert Time  ${startup_time.split("= ",1)[1].strip(".")}
+
+    Should Be True  ${startup_time} < ${startup_time_threshold}
+    ...  msg=${startup_time} greater than threshold value of ${startup_time_threshold}.
diff --git a/tests/test_basic_poweron.robot b/tests/test_basic_poweron.robot
deleted file mode 100644
index ad4db6f..0000000
--- a/tests/test_basic_poweron.robot
+++ /dev/null
@@ -1,160 +0,0 @@
-*** Settings ***
-Documentation  Test power on for HW CI.
-
-Library             DateTime
-
-Resource            ../lib/openbmc_ffdc.robot
-Resource            ../lib/utils.robot
-Resource            ../lib/state_manager.robot
-Resource            ../lib/open_power_utils.robot
-Resource            ../lib/ipmi_client.robot
-Resource            ../lib/boot_utils.robot
-Resource            ../lib/remote_logging_utils.robot
-
-Suite Setup         Set REST Logging Policy  ${True}
-Test Teardown       FFDC On Test Case Fail
-Suite Teardown      Set REST Logging Policy  ${False}
-
-Force Tags  chassisboot
-
-*** Variables ***
-
-# User may pass LOOP_COUNT.
-# By default 2 cycle for CI/CT.
-${LOOP_COUNT}  ${2}
-
-# Error strings to check from journald.
-${ERROR_REGEX}     SEGV|core-dump|FAILURE|Failed to start
-${STANDBY_REGEX}   Startup finished in
-
-# 3 minutes standby boot time.
-${startup_time_threshold}  180
-
-*** Test Cases ***
-
-Test Remote Logging Configuration
-    [Documentation]  Configure remote log server and verify configuration.
-    [Tags]  Test_Remote_Logging_Configuration
-
-    # Dummy IP and port to update /etc/rsyslog.d/server.conf
-    Configure Remote Log Server With Parameters
-    ...  remote_host=10.10.10.10  remote_port=514
-
-    Verify Rsyslog Config On BMC  remote_host=10.10.10.10  remote_port=514
-
-    # Reset to default configuration.
-    Configure Remote Log Server With Parameters
-    ...  remote_host=${EMPTY}  remote_port=0
-
-
-Verify Front And Rear LED At Standby
-    [Documentation]  Front and Rear LED should be off at standby.
-    [Tags]  Verify_Front_And_Rear_LED_At_Standby
-
-    REST Power Off  stack_mode=skip  quiet=1
-    Verify Identify LED State  ${0}
-
-
-Verify Application Services Running At Standby
-    [Documentation]  Check if there are services that have not completed.
-    [Tags]  Verify_Application_Services_Running_At_Standby
-
-    # Application services running on the BMC are not tightly coupled.
-    # At standby, there shouldn't be any pending job waiting to complete.
-    # Examples:
-    # Failure o/p:
-    # root@witherspoon:~# systemctl list-jobs --no-pager | cat
-    #    JOB UNIT                                     TYPE  STATE
-    # 35151 xyz.openbmc_project.ObjectMapper.service start running
-    # 1 jobs listed.
-    #
-    # Success o/p:
-    # root@witherspoon:~# systemctl list-jobs --no-pager | cat
-    # No jobs running.
-
-    REST Power Off  stack_mode=skip  quiet=1
-    ${stdout}  ${stderr}  ${rc}=  BMC Execute Command
-    ...  systemctl list-jobs --no-pager | cat
-    Should Be Equal As Strings  ${stdout}  No jobs running.
-
-
-Power On Test
-    [Documentation]  Power off and on.
-    [Tags]  Power_On_Test
-    [Setup]  Test Setup Execution
-    [Teardown]  Test Teardown Execution
-
-    Repeat Keyword  ${LOOP_COUNT} times  Host Off And On
-
-
-Check For Application Failures
-    [Documentation]  Parse the journal log and check for failures.
-    [Tags]  Check_For_Application_Failures
-
-    Check For Regex In Journald  ${ERROR_REGEX}  error_check=${0}  boot=-b
-
-
-Verify Uptime Average Against Threshold
-    [Documentation]  Compare BMC average boot time to a constant threshold.
-    [Tags]  Verify_Uptime_Average_Against_Threshold
-
-    OBMC Reboot (off)
-
-    Wait Until Keyword Succeeds
-    ...  1 min  30 sec  Check BMC Uptime Journald
-
-
-Test SSH And IPMI Connections
-    [Documentation]  Try SSH and IPMI commands to verify each connection.
-    [Tags]  Test_SSH_And_IPMI_Connections
-
-    Check If BMC Is Up  3 min  20 sec
-    Wait Until Keyword Succeeds
-    ...  3 min  30 sec  Wait for BMC state  Ready
-
-    BMC Execute Command  true
-    Run IPMI Standard Command  chassis status
-
-*** Keywords ***
-
-Test Setup Execution
-    [Documentation]  Do test case setup tasks.
-    Start SOL Console Logging
-    Set Auto Reboot  ${0}
-
-Test Teardown Execution
-    [Documentation]  Collect FFDC and SOL log.
-    FFDC On Test Case Fail
-    ${sol_log}=    Stop SOL Console Logging
-    Log   ${sol_log}
-    Set Auto Reboot  ${1}
-
-Host Off And On
-    [Documentation]  Verify power off and on.
-
-    Initiate Host PowerOff
-
-    Initiate Host Boot
-    Verify OCC State
-
-    # TODO: Host shutdown race condition.
-    # Wait 30 seconds before Powering Off.
-    Sleep  30s
-
-
-Check BMC Uptime Journald
-    [Documentation]  Check BMC journald uptime entry.
-
-    # Example output:
-    # Startup finished in 10.074s (kernel) + 2min 23.506s (userspace) = 2min 33.581s.
-    ${startup_time}  ${stderr}  ${rc}=  BMC Execute Command
-    ...  journalctl --no-pager | egrep '${STANDBY_REGEX}' | tail -1
-    Should Not Be Empty  ${startup_time}
-
-    # Example time conversion:
-    # Get the "2min 33.581s" string total time taken to reach standby.
-    # Convert time "2min 33.581s" to unit 153.581.
-    ${startup_time}=  Convert Time  ${startup_time.split("= ",1)[1].strip(".")}
-
-    Should Be True  ${startup_time} < ${startup_time_threshold}
-    ...  msg=${startup_time} greater than threshold value of ${startup_time_threshold}.