diff --git a/openpower/ext_interfaces/test_client_identifier.robot b/openpower/ext_interfaces/test_client_identifier.robot
index b976bb3..6f80365 100644
--- a/openpower/ext_interfaces/test_client_identifier.robot
+++ b/openpower/ext_interfaces/test_client_identifier.robot
@@ -17,6 +17,7 @@
 Test Setup        Printn
 Test Teardown     FFDC On Test Case Fail
 
+Force Tags        Client_Identifier
 
 *** Test Cases ***
 
diff --git a/openpower/ext_interfaces/test_lock_management.robot b/openpower/ext_interfaces/test_lock_management.robot
index 0e9b6ab..d223db4 100644
--- a/openpower/ext_interfaces/test_lock_management.robot
+++ b/openpower/ext_interfaces/test_lock_management.robot
@@ -15,6 +15,8 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
+Foce Tags                Lock_Management
+
 *** Variables ***
 
 ${CONFLICT_RQUEST}       Conflict
diff --git a/openpower/ext_interfaces/test_savearea_management.robot b/openpower/ext_interfaces/test_savearea_management.robot
index 06654f0..c251093 100644
--- a/openpower/ext_interfaces/test_savearea_management.robot
+++ b/openpower/ext_interfaces/test_savearea_management.robot
@@ -14,6 +14,8 @@
 Test Teardown     Test Teardown Execution
 Suite Teardown    Suite Teardown Execution
 
+Force Tags        Savearea_Management
+
 *** Variables ***
 
 ${MAXIMUM_FILE_SIZE_MESSAGE}        File size exceeds maximum allowed size[25MB]
diff --git a/openpower/localuser/test_ipmi_redfish_user.robot b/openpower/localuser/test_ipmi_redfish_user.robot
index 23eb579..da56462 100644
--- a/openpower/localuser/test_ipmi_redfish_user.robot
+++ b/openpower/localuser/test_ipmi_redfish_user.robot
@@ -12,6 +12,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
+Force Tags       IPMI_Redfish_User
 
 *** Variables ***
 
diff --git a/openpower/mpipl/test_mpipl_basic.robot b/openpower/mpipl/test_mpipl_basic.robot
index 2f8e47c..ca1498b 100644
--- a/openpower/mpipl/test_mpipl_basic.robot
+++ b/openpower/mpipl/test_mpipl_basic.robot
@@ -16,6 +16,8 @@
 Test Teardown    Test Teardown Execution
 Suite Teardown   Suite Teardown Execution
 
+Force Tags       MPIPL_Basic
+
 *** Variables ***
 
 # By default 1 iteration, user can key in nth number of iteration to control
diff --git a/openpower/pel/test_bmc_pel.robot b/openpower/pel/test_bmc_pel.robot
index ce606a7..051fae7 100644
--- a/openpower/pel/test_bmc_pel.robot
+++ b/openpower/pel/test_bmc_pel.robot
@@ -11,6 +11,7 @@
 Test Setup      Redfish.Login
 Test Teardown   Run Keywords  Redfish.Logout  AND  FFDC On Test Case Fail
 
+Force Tags      Bmc_Pel
 
 *** Variables ***
 
@@ -724,9 +725,9 @@
     [Tags]  Verify_PEL_Log_Offloaded_To_Host
     [Template]  Verify PEL Transmission To Host
 
-    # error_type            host_state      expected_transmission_state   
-      predictive_error      On              Acked         
-      unrecoverable_error   On              Acked              
+    # error_type            host_state      expected_transmission_state
+      predictive_error      On              Acked
+      unrecoverable_error   On              Acked
       informational_error   On              Acked
 
 
diff --git a/openpower/service_account/test_service_login.robot b/openpower/service_account/test_service_login.robot
index b366cf0..8521a2a 100644
--- a/openpower/service_account/test_service_login.robot
+++ b/openpower/service_account/test_service_login.robot
@@ -18,6 +18,7 @@
 Suite Setup      Suite Setup Execution
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       Service_Login
 
 *** Variables ***
 
diff --git a/openpower/service_account/test_service_user.robot b/openpower/service_account/test_service_user.robot
index 78c5a5a..273aa8e 100644
--- a/openpower/service_account/test_service_user.robot
+++ b/openpower/service_account/test_service_user.robot
@@ -9,6 +9,7 @@
 Suite Teardown   Redfish.Logout
 Test Teardown    FFDC On Test Case Fail
 
+Force Tags       Service_User
 
 *** Test Cases ***
 
diff --git a/openpower/vpd/test_vpd_tool.robot b/openpower/vpd/test_vpd_tool.robot
index 0bda1db..9061802 100644
--- a/openpower/vpd/test_vpd_tool.robot
+++ b/openpower/vpd/test_vpd_tool.robot
@@ -7,6 +7,7 @@
 
 Test Teardown   FFDC On Test Case Fail
 
+Force Tags      VPD_Tool
 
 *** Variables ***