diff --git a/redfish/extended/test_xit.robot b/redfish/test_xit.robot
similarity index 95%
rename from redfish/extended/test_xit.robot
rename to redfish/test_xit.robot
index cdfc740..1a5a3ba 100644
--- a/redfish/extended/test_xit.robot
+++ b/redfish/test_xit.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation   This suite is to run some test at the end of execution.
 
-Resource        ../../lib/openbmc_ffdc.robot
+Resource        ../lib/openbmc_ffdc.robot
 
 Test Teardown   FFDC On Test Case Fail
 
diff --git a/test_lists/CT_basic_run b/test_lists/CT_basic_run
index 1e32813..11b15e6 100644
--- a/test_lists/CT_basic_run
+++ b/test_lists/CT_basic_run
@@ -38,4 +38,4 @@
 #BMC sync list test
 -i Test_BMC_Alt_Side_Mirroring
 # Check for BMC dump.
--i Verify_No_BMC_Dump_And_Application_Failures
+-i Verify_No_BMC_Dump_And_Application_Failures_In_BMC
diff --git a/test_lists/HW_CI b/test_lists/HW_CI
index e9aa57b..0e4afea 100644
--- a/test_lists/HW_CI
+++ b/test_lists/HW_CI
@@ -7,8 +7,6 @@
 -i Check_For_Application_Failures
 #Verify system boot time average
 -i Verify_Uptime_Average_Against_Threshold
-#Check for BMC dump.
--i Verify_No_BMC_Dump_And_Application_Failures
 #Redfish tests cases.
 -i Redfish_Login_And_Logout
 -i GET_Redfish_Hypermedia_Without_Login
@@ -26,3 +24,5 @@
 -i Verify_IPMI_User_Deletion
 #Local user tests.
 -i Verify_AccountService_Available
+#Check for BMC dump.
+-i Verify_No_BMC_Dump_And_Application_Failures_In_BMC
diff --git a/test_lists/HW_CI_DEV b/test_lists/HW_CI_DEV
index e9aa57b..0e4afea 100644
--- a/test_lists/HW_CI_DEV
+++ b/test_lists/HW_CI_DEV
@@ -7,8 +7,6 @@
 -i Check_For_Application_Failures
 #Verify system boot time average
 -i Verify_Uptime_Average_Against_Threshold
-#Check for BMC dump.
--i Verify_No_BMC_Dump_And_Application_Failures
 #Redfish tests cases.
 -i Redfish_Login_And_Logout
 -i GET_Redfish_Hypermedia_Without_Login
@@ -26,3 +24,5 @@
 -i Verify_IPMI_User_Deletion
 #Local user tests.
 -i Verify_AccountService_Available
+#Check for BMC dump.
+-i Verify_No_BMC_Dump_And_Application_Failures_In_BMC