diff --git a/ipmi/test_ipmi_cold_reset.robot b/ipmi/test_ipmi_cold_reset.robot
index 47784c0..e13a000 100644
--- a/ipmi/test_ipmi_cold_reset.robot
+++ b/ipmi/test_ipmi_cold_reset.robot
@@ -21,10 +21,10 @@
 ...
 ...                 Request data for cold reset present under data/ipmi_raw_cmd_table.py
 
-Library             Collections
-Library             ../lib/ipmi_utils.py
 Resource            ../lib/ipmi_client.robot
 Resource            ../lib/openbmc_ffdc.robot
+Library             Collections
+Library             ../lib/ipmi_utils.py
 Variables           ../data/ipmi_raw_cmd_table.py
 
 Test Teardown       FFDC On Test Case Fail
diff --git a/ipmi/test_ipmi_device_id.robot b/ipmi/test_ipmi_device_id.robot
index 17f7562..c4125f4 100644
--- a/ipmi/test_ipmi_device_id.robot
+++ b/ipmi/test_ipmi_device_id.robot
@@ -14,11 +14,11 @@
 ...                       - data/ipmi_raw_cmd_table.py
 
 
+Resource            ../lib/ipmi_client.robot
+Resource            ../lib/openbmc_ffdc.robot
 Library             Collections
 Library             ../lib/ipmi_utils.py
 Library             ../lib/var_funcs.py
-Resource            ../lib/ipmi_client.robot
-Resource            ../lib/openbmc_ffdc.robot
 Variables           ../data/ipmi_raw_cmd_table.py
 
 
diff --git a/ipmi/test_ipmi_poh_counter.robot b/ipmi/test_ipmi_poh_counter.robot
index ebe37a4..b664a85 100644
--- a/ipmi/test_ipmi_poh_counter.robot
+++ b/ipmi/test_ipmi_poh_counter.robot
@@ -25,10 +25,10 @@
 ...                 time / Power operation.
 
 
-Library             Collections
-Library             ../lib/ipmi_utils.py
 Resource            ../lib/ipmi_client.robot
 Resource            ../lib/openbmc_ffdc.robot
+Library             Collections
+Library             ../lib/ipmi_utils.py
 Variables           ../data/ipmi_raw_cmd_table.py
 
 Suite Setup      Suite Setup Execution
diff --git a/ipmi/test_ipmi_sdr.robot b/ipmi/test_ipmi_sdr.robot
index 9755cd1..5a289be 100755
--- a/ipmi/test_ipmi_sdr.robot
+++ b/ipmi/test_ipmi_sdr.robot
@@ -1,8 +1,8 @@
 *** Settings ***
 Documentation  Test IPMI sensor IDs.
 
-Resource               ../lib/rest_client.robot
 Resource               ../lib/ipmi_client.robot
+Resource               ../lib/rest_client.robot
 Resource               ../lib/openbmc_ffdc.robot
 Resource               ../lib/boot_utils.robot
 Resource               ../lib/bmc_redfish_resource.robot
diff --git a/ipmi/test_ipmi_sel_time.robot b/ipmi/test_ipmi_sel_time.robot
index 0265b3c..089ee70 100644
--- a/ipmi/test_ipmi_sel_time.robot
+++ b/ipmi/test_ipmi_sel_time.robot
@@ -26,12 +26,12 @@
 ...              Gets BMC Current Time and subtracts 1 day and compare against BMC native command (date),
 ...              Add SEL Entry for all the above scenarios and compare against BMC native command (date).
 
+Resource         ../lib/ipmi_client.robot
+Resource         ../lib/openbmc_ffdc.robot
 Library          DateTime
 Library          Collections
 Library          String
 Library          ../lib/ipmi_utils.py
-Resource         ../lib/ipmi_client.robot
-Resource         ../lib/openbmc_ffdc.robot
 Variables        ../data/ipmi_raw_cmd_table.py
 
 Test Setup       Test Setup Execution
diff --git a/ipmi/test_ipmi_systeminfo_parameters.robot b/ipmi/test_ipmi_systeminfo_parameters.robot
index 0ca45da..9c3aef0 100644
--- a/ipmi/test_ipmi_systeminfo_parameters.robot
+++ b/ipmi/test_ipmi_systeminfo_parameters.robot
@@ -9,10 +9,10 @@
 ...                 5. OS Name - param 4,
 ...                 6. Present OS Version Number - param 5.
 
-Library             Collections
-Library             String
 Resource            ../lib/ipmi_client.robot
 Resource            ../lib/openbmc_ffdc.robot
+Library             Collections
+Library             String
 Library             ../lib/ipmi_utils.py
 Variables           ../data/ipmi_raw_cmd_table.py