diff --git a/openpower/ext_interfaces/test_client_identifier.robot b/openpower/ext_interfaces/test_client_identifier.robot
index 194be6a..99c9924 100644
--- a/openpower/ext_interfaces/test_client_identifier.robot
+++ b/openpower/ext_interfaces/test_client_identifier.robot
@@ -17,7 +17,7 @@
 Test Setup        Printn
 Test Teardown     FFDC On Test Case Fail
 
-Force Tags        Client_Identifier
+Test Tags        Client_Identifier
 
 *** Test Cases ***
 
diff --git a/openpower/ext_interfaces/test_lock_management.robot b/openpower/ext_interfaces/test_lock_management.robot
index 9fe0b70..0e29da5 100644
--- a/openpower/ext_interfaces/test_lock_management.robot
+++ b/openpower/ext_interfaces/test_lock_management.robot
@@ -15,7 +15,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Lock_Management
+Test Tags               Lock_Management
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_savearea_management.robot b/openpower/ext_interfaces/test_savearea_management.robot
index 5493d62..0b669d1 100644
--- a/openpower/ext_interfaces/test_savearea_management.robot
+++ b/openpower/ext_interfaces/test_savearea_management.robot
@@ -14,7 +14,7 @@
 Test Teardown     Test Teardown Execution
 Suite Teardown    Suite Teardown Execution
 
-Force Tags        Savearea_Management
+Test Tags        Savearea_Management
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_vmi.robot b/openpower/ext_interfaces/test_vmi.robot
index f036d5f..c3782fb 100644
--- a/openpower/ext_interfaces/test_vmi.robot
+++ b/openpower/ext_interfaces/test_vmi.robot
@@ -8,7 +8,7 @@
 Test Teardown     FFDC On Test Case Fail
 Suite Teardown    Run Keyword And Ignore Error  Suite Teardown Execution
 
-Force Tags        Vmi
+Test Tags        Vmi
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot b/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot
index c39497e..973f26f 100644
--- a/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot
+++ b/openpower/ext_interfaces/test_vmi_multiple_interfaces.robot
@@ -10,7 +10,7 @@
 Suite Setup       Suite Setup Execution
 Suite Teardown    Run Keyword And Ignore Error  Suite Teardown Execution
 
-Force Tags        Vmi_Multiple_Interfaces
+Test Tags        Vmi_Multiple_Interfaces
 
 *** Variables ***
 
diff --git a/openpower/ext_interfaces/test_vmicert_management.robot b/openpower/ext_interfaces/test_vmicert_management.robot
index ed3cd67..2978480 100644
--- a/openpower/ext_interfaces/test_vmicert_management.robot
+++ b/openpower/ext_interfaces/test_vmicert_management.robot
@@ -13,7 +13,7 @@
 Test Teardown     FFDC On Test Case Fail
 Suite Teardown    Run Keyword And Ignore Error  Suite Teardown Execution
 
-Force Tags        Vmicert_Management
+Test Tags        Vmicert_Management
 
 
 *** Variables ***
diff --git a/openpower/ipmi/test_ipmi_sdr.robot b/openpower/ipmi/test_ipmi_sdr.robot
index c1f9322..8fb12fa 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              Ipmi_Sdr
+Test Tags              Ipmi_Sdr
 
 
 *** Test Cases ***
diff --git a/openpower/localuser/test_ipmi_redfish_user.robot b/openpower/localuser/test_ipmi_redfish_user.robot
index 9bdb551..f147362 100644
--- a/openpower/localuser/test_ipmi_redfish_user.robot
+++ b/openpower/localuser/test_ipmi_redfish_user.robot
@@ -12,7 +12,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
-Force Tags       IPMI_Redfish_User
+Test Tags       IPMI_Redfish_User
 
 *** Variables ***
 
diff --git a/openpower/mpipl/test_mpipl_basic.robot b/openpower/mpipl/test_mpipl_basic.robot
index 5fd0507..6757f6f 100644
--- a/openpower/mpipl/test_mpipl_basic.robot
+++ b/openpower/mpipl/test_mpipl_basic.robot
@@ -16,7 +16,7 @@
 Test Teardown    Test Teardown Execution
 Suite Teardown   Suite Teardown Execution
 
-Force Tags       MPIPL_Basic
+Test Tags       MPIPL_Basic
 
 *** Variables ***
 
diff --git a/openpower/pel/test_bmc_pel.robot b/openpower/pel/test_bmc_pel.robot
index aa2dbb3..6f7f8c8 100644
--- a/openpower/pel/test_bmc_pel.robot
+++ b/openpower/pel/test_bmc_pel.robot
@@ -11,7 +11,7 @@
 Test Setup      Redfish.Login
 Test Teardown   Run Keywords  Redfish.Logout  AND  FFDC On Test Case Fail
 
-Force Tags      Bmc_Pel
+Test Tags      Bmc_Pel
 
 *** Variables ***
 
diff --git a/openpower/ras/test_bmc_ras.robot b/openpower/ras/test_bmc_ras.robot
index 81c56d6..e90ac08 100755
--- a/openpower/ras/test_bmc_ras.robot
+++ b/openpower/ras/test_bmc_ras.robot
@@ -19,7 +19,7 @@
 Test Teardown       FFDC On Test Case Fail
 Suite Teardown      RAS Suite Cleanup
 
-Force Tags          BMC_RAS
+Test Tags          BMC_RAS
 
 *** Variables ***
 ${stack_mode}       normal
diff --git a/openpower/ras/test_host_boot_ras.robot b/openpower/ras/test_host_boot_ras.robot
index ca785c5..88f04dd 100644
--- a/openpower/ras/test_host_boot_ras.robot
+++ b/openpower/ras/test_host_boot_ras.robot
@@ -19,7 +19,7 @@
 Test Teardown       FFDC On Test Case Fail
 Suite Teardown      RAS Suite Cleanup
 
-Force Tags          Host_Boot_RAS
+Test Tags          Host_Boot_RAS
 
 *** Variables ***
 ${stack_mode}       normal
diff --git a/openpower/ras/test_host_ras.robot b/openpower/ras/test_host_ras.robot
index c5edd3d..28813a8 100755
--- a/openpower/ras/test_host_ras.robot
+++ b/openpower/ras/test_host_ras.robot
@@ -18,7 +18,7 @@
 Test Teardown       FFDC On Test Case Fail
 Suite Teardown      RAS Suite Cleanup
 
-Force Tags          Host_RAS
+Test Tags          Host_RAS
 
 *** Variables ***
 ${stack_mode}       normal
diff --git a/openpower/ras/test_reboot_ras.robot b/openpower/ras/test_reboot_ras.robot
index c031e8a..aab9130 100755
--- a/openpower/ras/test_reboot_ras.robot
+++ b/openpower/ras/test_reboot_ras.robot
@@ -14,7 +14,7 @@
 Test Teardown       FFDC On Test Case Fail
 Suite Teardown      RAS Suite Cleanup
 
-Force Tags          Reboot_RAS
+Test Tags          Reboot_RAS
 
 *** Test Cases ***
 Verify Host Unrecoverable Callout Handling At Reboot
diff --git a/openpower/vpd/test_vpd_tool.robot b/openpower/vpd/test_vpd_tool.robot
index 9061802..50d8934 100644
--- a/openpower/vpd/test_vpd_tool.robot
+++ b/openpower/vpd/test_vpd_tool.robot
@@ -7,7 +7,7 @@
 
 Test Teardown   FFDC On Test Case Fail
 
-Force Tags      VPD_Tool
+Test Tags      VPD_Tool
 
 *** Variables ***