diff --git a/tests/ipmi/test_sdr.robot b/ipmi/test_ipmi_sdr.robot
similarity index 86%
rename from tests/ipmi/test_sdr.robot
rename to ipmi/test_ipmi_sdr.robot
index cd6ed0f..8ebc9ec 100755
--- a/tests/ipmi/test_sdr.robot
+++ b/ipmi/test_ipmi_sdr.robot
@@ -1,10 +1,11 @@
 *** Settings ***
 Documentation  Test IPMI sensor IDs.
 
-Resource               ../../lib/rest_client.robot
-Resource               ../../lib/ipmi_client.robot
-Resource               ../../lib/openbmc_ffdc.robot
-Resource               ../../lib/boot_utils.robot
+Resource               ../lib/rest_client.robot
+Resource               ../lib/ipmi_client.robot
+Resource               ../lib/openbmc_ffdc.robot
+Resource               ../lib/boot_utils.robot
+Resource               ../lib/bmc_redfish_resource.robot
 
 Suite setup             Suite Setup Execution
 Test Teardown           Test Teardown Execution
@@ -16,52 +17,52 @@
 
 
 Test CPU Core SDR Info At Power On
-    [Documentation]  Verify CPU core SDR info via IPMI and REST at power on.
+    [Documentation]  Verify CPU core SDR info via IPMI and Redfish at power on.
 
     [Tags]  Test_CPU_Core_SDR_Info_At_Power_On
 
-    REST Power On  stack_mode=skip  quiet=1
+    Redfish Power On  stack_mode=skip  quiet=1
     Test SDR Info  core
 
 
 Test DIMM SDR Info At Power On
-    [Documentation]  Verify DIMM SDR info via IPMI and REST at power on.
+    [Documentation]  Verify DIMM SDR info via IPMI and Redfish at power on.
 
     [Tags]  Test_DIMM_SDR_Info_At_Power_On
 
-    REST Power On  stack_mode=skip  quiet=1
+    Redfish Power On  stack_mode=skip  quiet=1
     Test SDR Info  dimm
 
 
 Test GPU SDR Info At Power On
-    [Documentation]  Verify GPU SDR info via IPMI and REST at power on.
+    [Documentation]  Verify GPU SDR info via IPMI and Redfish at power on.
 
     [Tags]  Test_GPU_SDR_Info_At_Power_On
 
-    REST Power On  stack_mode=skip  quiet=1
+    Redfish Power On  stack_mode=skip  quiet=1
     Test SDR Info  gv100card
 
 
 Test CPU Core SDR Info At Power Off
-    [Documentation]  Verify CPU core SDR info via IPMI and REST at power off.
+    [Documentation]  Verify CPU core SDR info via IPMI and Redfish at power off.
 
     [Tags]  Test_CPU_Core_SDR_Info_At_Power_Off
 
-    REST Power Off  stack_mode=skip  quiet=1
+    Redfish Hard Power Off  stack_mode=skip  quiet=1
     Test SDR Info  core
 
 
 Test DIMM SDR Info At Power Off
-    [Documentation]  Verify DIMM SDR info via IPMI and REST at power off.
+    [Documentation]  Verify DIMM SDR info via IPMI and Redfish at power off.
 
     [Tags]  Test_DIMM_SDR_Info_At_Power_Off
 
-    REST Power Off  stack_mode=skip  quiet=1
+    Redfish Hard Power Off  stack_mode=skip  quiet=1
     Test SDR Info  dimm
 
 
 Test Turbo Allowed SDR Info
-    [Documentation]  Verify turbo allowed SDR info via IPMI and REST.
+    [Documentation]  Verify turbo allowed SDR info via IPMI and Redfish.
     [Tags]  Test_Turbo_Allowed_SDR_Info
 
     ${component_uri_list}=  Get Component URIs  turbo_allowed
@@ -77,7 +78,7 @@
 
 
 Test Auto Reboot SDR Info
-    [Documentation]  Verify auto reboot SDR info via IPMI and REST.
+    [Documentation]  Verify auto reboot SDR info via IPMI and Redfish.
     [Tags]  Test_Auto_Reboot_SDR_Info
 
 
@@ -94,7 +95,7 @@
 
 
 Test TPM Enable SDR Info
-    [Documentation]  Verify auto reboot SDR info via IPMI and REST.
+    [Documentation]  Verify auto reboot SDR info via IPMI and Redfish.
     [Tags]  Test_TPM_Enable_SDR_Info
 
 
@@ -171,7 +172,7 @@
 
 Verify SDR
     [Documentation]  Verify IPMI sensor data record for given component
-    ...  with REST.
+    ...  with Redfish.
     [Arguments]  ${component_name}
 
     # Description of argument(s):
@@ -217,7 +218,7 @@
 Suite Setup Execution
     [Documentation]  Do the initial suite setup.
 
-    REST Power On  stack_mode=skip
+    Redfish Power On
 
     ${uri_list}=  Read Properties  ${OPENBMC_BASE_URI}list
     Set Suite Variable  ${SYSTEM_URI}  ${uri_list}
diff --git a/ipmi/test_sol.robot b/ipmi/test_ipmi_sol.robot
similarity index 100%
rename from ipmi/test_sol.robot
rename to ipmi/test_ipmi_sol.robot