diff --git a/gui/test/access_control/test_obmc_gui_local_users.robot b/gui/test/access_control/test_obmc_gui_local_users.robot
index b3a0db3..444e81a 100644
--- a/gui/test/access_control/test_obmc_gui_local_users.robot
+++ b/gui/test/access_control/test_obmc_gui_local_users.robot
@@ -7,7 +7,7 @@
 Suite Setup     Launch Browser And Login OpenBMC GUI
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
-Force Tags      Manage_User
+Force Tags      Obmc_Gui_Local_Users
 
 *** Variables ***
 
diff --git a/ipmi/test_ipmi_inband_sdr.robot b/ipmi/test_ipmi_inband_sdr.robot
index 9940423..2e438a0 100644
--- a/ipmi/test_ipmi_inband_sdr.robot
+++ b/ipmi/test_ipmi_inband_sdr.robot
@@ -16,7 +16,7 @@
 Suite Teardown         Redfish.Logout
 Test Teardown          FFDC On Test Case Fail
 
-Force Tags             SDR_Test
+Force Tags             Ipmi_Inband_Sdr
 
 
 *** Test Cases ***
@@ -498,4 +498,4 @@
     Redfish.Login
     Should Not Be Empty  ${OS_HOST}  msg=Please provide required parameter OS_HOST
     Should Not Be Empty  ${OS_USERNAME}  msg=Please provide required parameter OS_USERNAME
-    Should Not Be Empty  ${OS_PASSWORD}  msg=Please provide required parameter OS_PASSWORD
\ No newline at end of file
+    Should Not Be Empty  ${OS_PASSWORD}  msg=Please provide required parameter OS_PASSWORD
diff --git a/ipmi/test_ipmi_network_configuration.robot b/ipmi/test_ipmi_network_configuration.robot
index d97e15d..f645b46 100644
--- a/ipmi/test_ipmi_network_configuration.robot
+++ b/ipmi/test_ipmi_network_configuration.robot
@@ -15,7 +15,7 @@
 Test Setup             Printn
 Test Teardown          Test Teardown Execution
 
-Force Tags             IPMI_Network_Config
+Force Tags             Ipmi_Network_Configuration
 
 
 *** Variables ***
diff --git a/ipmi/test_ipmi_network_verification.robot b/ipmi/test_ipmi_network_verification.robot
index 35a0df6..11d99d5 100644
--- a/ipmi/test_ipmi_network_verification.robot
+++ b/ipmi/test_ipmi_network_verification.robot
@@ -14,7 +14,7 @@
 Test Setup             Printn
 Test Teardown          FFDC On Test Case Fail
 
-Force Tags             IPMI_Network_Verify
+Force Tags             Ipmi_Network_Verification
 
 
 *** Variables ***
diff --git a/ipmi/test_ipmi_sdr.robot b/ipmi/test_ipmi_sdr.robot
index 5a289be..b176368 100755
--- a/ipmi/test_ipmi_sdr.robot
+++ b/ipmi/test_ipmi_sdr.robot
@@ -14,7 +14,7 @@
 Suite Teardown          Redfish.Logout
 Test Teardown           Test Teardown Execution
 
-Force Tags              SDR_Test
+Force Tags              Ipmi_Sdr
 
 
 *** Test Cases ***
diff --git a/ipmi/test_ipmi_sol.robot b/ipmi/test_ipmi_sol.robot
index b4659c3..f13a212 100644
--- a/ipmi/test_ipmi_sol.robot
+++ b/ipmi/test_ipmi_sol.robot
@@ -12,7 +12,7 @@
 Test Setup          Start SOL Console Logging
 Test Teardown       Test Teardown Execution
 
-Force Tags          SOL_Test
+Force Tags          Ipmi_Sol
 
 
 *** Variables ***
diff --git a/network/network_diagnostic_report.robot b/network/network_diagnostic_report.robot
index dc89a36..9e02a96 100644
--- a/network/network_diagnostic_report.robot
+++ b/network/network_diagnostic_report.robot
@@ -7,7 +7,7 @@
 Resource      ../lib/utils.robot
 Test Setup    Check If Tool Exist
 
-Force Tags  Check_Network_Latency
+Force Tags  Network_Diagnostic_Report
 
 *** Test Cases ***
 
diff --git a/network/test_host_network.robot b/network/test_host_network.robot
index 4d46033..33cd1c2 100644
--- a/network/test_host_network.robot
+++ b/network/test_host_network.robot
@@ -11,7 +11,7 @@
 Test Setup          Open Connection And Log In
 Test Teardown       Test Teardown Execution
 
-Force Tags          Host_Network_Test
+Force Tags          Host_Network
 
 *** Variables ***
 ${SET_ADDR_PREFIX}  0x00 0x08 0x61 0x80 0x21 0x70 0x62 0x21 0x00 0x01 0x06 0x04
diff --git a/openpower/ipmi/test_ipmi_sdr.robot b/openpower/ipmi/test_ipmi_sdr.robot
index 2e861ae..04886ec 100755
--- a/openpower/ipmi/test_ipmi_sdr.robot
+++ b/openpower/ipmi/test_ipmi_sdr.robot
@@ -11,7 +11,7 @@
 Suite Teardown          Redfish.Logout
 Test Teardown           Test Teardown Execution
 
-Force Tags              SDR_Test
+Force Tags              Ipmi_Sdr
 
 
 *** Test Cases ***
diff --git a/test_lists/witherspoon/skip_oob_ipmi b/test_lists/witherspoon/skip_oob_ipmi
index 23947df..008caad 100755
--- a/test_lists/witherspoon/skip_oob_ipmi
+++ b/test_lists/witherspoon/skip_oob_ipmi
@@ -2,4 +2,4 @@
 --exclude Verify_Disabling_And_Enabling_IPMI_Via_Host
 --exclude Verify_Disabling_IPMI_Via_OOB_IPMI
 --exclude Verify_IPMI_Disable_Persistency_After_BMC_Reboot
---exclude SOL_Test
+--exclude Ipmi_Sol